--- a/agendainterface/agendautil/src/agendautil_p.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/agendainterface/agendautil/src/agendautil_p.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -1789,7 +1789,9 @@
*/
QDateTime AgendaUtilPrivate::maxTime()
{
- TTime maxTime = TCalTime::MaxTime();
+ // Returns maximum time allowed, 31.12.2100 0:00 is max so 30.12.2100 is
+ // last actual date to be used.
+ TTime maxTime = TCalTime::MaxTime() - TTimeIntervalMinutes( 1 );
// Convert it to QT
QDate date(
@@ -2962,14 +2964,14 @@
calRRule.GetByMonthDayL(monthDays);
QList<int> qMonthDays;
for (int i = 0; i < monthDays.Count(); i++) {
- qMonthDays.append(monthDays[i]);
+ qMonthDays.append(monthDays[i] + 1);
}
agendaRepeatRule.setByMonthDay(qMonthDays);
agendaRepeatRule.setType((AgendaRepeatRule::RuleType) (calRRule.Type()));
agendaRepeatRule.setInterval(calRRule.Interval());
TCalTime time = calRRule.Until();
- TTime untilTime = time.TimeUtcL();
+ TTime untilTime = time.TimeLocalL();
QDateTime repeatUntil(QDate(untilTime.DateTime().Year(),
untilTime.DateTime().Month() + 1,
untilTime.DateTime().Day() + 1),
@@ -2978,7 +2980,7 @@
agendaRepeatRule.setUntil(repeatUntil);
TCalTime dayStart = calRRule.DtStart();
- TDateTime ruleStart = dayStart.TimeUtcL().DateTime();
+ TDateTime ruleStart = dayStart.TimeLocalL().DateTime();
QDateTime qRuleStart(QDate(ruleStart.Year(), ruleStart.Month() + 1,
ruleStart.Day() + 1),QTime(ruleStart.Hour(), ruleStart.Minute()));
agendaRepeatRule.setRepeatRuleStart(qRuleStart);
@@ -3029,6 +3031,7 @@
repeatRule.SetDtStart(ruleStartCalTime);
repeatRule.SetInterval(agendaRRule.interval());
repeatRule.SetUntil(ruleRepeatTillTime);
+ repeatRule.SetWkSt((TDay)agendaRRule.weekStart());
QList<AgendaRepeatRule::Day> qDays = agendaRRule.byDay();
RArray<TDay> days;
--- a/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertinterface/src/alarmalertwidget.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -127,7 +127,7 @@
alarmInfo->iTime.FormatL(timeString, timeFormat);
- alarmInfo->iTime.FormatL(dateString, dateFormat);
+ alarmInfo->iDate.FormatL(dateString, dateFormat);
// Create a session with the device dialog server
mDeviceDialog = CHbDeviceDialogSymbian::NewL();
--- a/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/alarmalertplugin.pro Fri Sep 17 08:29:05 2010 +0300
@@ -33,7 +33,6 @@
alarmalertdocloader.cpp
-
RESOURCES += alarmalert.qrc
TRANSLATIONS += alarmui.ts
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/alarmalert.qrc Fri Sep 17 08:29:05 2010 +0300
@@ -1,7 +1,8 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/xml">
- <file alias="alarmalert_calendar_unlocked.docml">xml/alarmalert_calendar_unlocked.docml</file>
+ <file alias="alarmalert_timed_calendar_unlocked.docml">xml/alarmalert_timed_calendar_unlocked.docml</file>
<file alias="alarmalert_clock_unlocked.docml">xml/alarmalert_clock_unlocked.docml</file>
<file alias="alarmalert_todo_unlocked.docml">xml/alarmalert_todo_unlocked.docml</file>
+ <file alias="alarmalert_nontimed_calendar_unlocked.docml">xml/alarmalert_nontimed_calendar_unlocked.docml</file>
</qresource>
</RCC>
\ No newline at end of file
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
- <object name="snoozeAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
- </object>
- <object name="stopAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
- </object>
- <widget name="dialog" type="HbDialog">
- <ref object="snoozeAction" role="HbWidget:addAction"/>
- <ref object="stopAction" role="HbWidget:addAction"/>
- <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
- <enums name="alignment" value="AlignLeft|AlignLeading"/>
- <string locid="txt_calendar_title_calendar_alarm" name="plainText" value="Calendar alarm"/>
- </widget>
- <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
- <widget name="alarmTime" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED" width="24un"/>
- <string name="plainText" value="time"/>
- </widget>
- <widget name="alarmDate" type="HbLabel">
- <real name="z" value="1"/>
- <string name="plainText" value="date"/>
- </widget>
- <widget name="alarmDescription" type="HbLabel">
- <real name="z" value="2"/>
- <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
- <string name="plainText" value="description"/>
- </widget>
- <widget name="alarmLocation" type="HbLabel">
- <real name="z" value="3"/>
- <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
- <string name="plainText" value="location"/>
- </widget>
- <widget name="alarmIcon" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <icon iconName="qtg_large_calendar_alarm" name="icon"/>
- <real name="z" value="4"/>
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="15un" type="FIXED" width="15un"/>
- </widget>
- <layout type="anchor">
- <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="1.34328un" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmTime" dstEdge="TOP" spacing="1.34328un" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-21.37314un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDate" dstEdge="BOTTOM" spacing="-3.8806un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="5.8209un" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDescription" dstEdge="BOTTOM" spacing="-3.13433un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="3.43284un" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="-8.83582un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="RIGHT" spacing="-3.91045un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-3.43284un" src="" srcEdge="BOTTOM"/>
- </layout>
- </widget>
- </widget>
- <section name="nonTimedAlarm">
- <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
- <layout type="anchor">
- <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDescription" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmLocation" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
- </layout>
- </widget>
- <widget name="alarmIcon" type="HbLabel">
- <icon iconName="qtg_large_calendar_alarm" name="icon"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
- <widget name="alarmLocation" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="alarmDate" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
- </widget>
- <widget name="alarmTime" type="HbLabel">
- <bool name="visible" value="FALSE"/>
- </widget>
- <widget name="alarmDescription" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
- <sizehint height="expr(3 * var(hb-param-text-height-primary))" type="PREFERRED"/>
- </widget>
- </section>
- <section name="calendarTimed">
- <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
- <layout type="anchor">
- <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmTime" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmTime" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDescription" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmLocation" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
- </layout>
- </widget>
- <widget name="alarmIcon" type="HbLabel">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <icon iconName="qtg_large_calendar_alarm" name="icon"/>
- </widget>
- <widget name="alarmLocation" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- </widget>
- <widget name="alarmDate" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
- </widget>
- <widget name="alarmDescription" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <sizehint height="expr(2 * var(hb-param-text-height-primary))" type="PREFERRED"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
- </widget>
- </section>
- <metadata activeUIState="calendarTimed" display="NHD-3.2-inch_portrait" unit="un">
- <uistate name="Common ui state" sections="#common"/>
- <uistate name="nonTimedAlarm" sections="#common nonTimedAlarm"/>
- <uistate name="calendarTimed" sections="#common calendarTimed"/>
- </metadata>
-</hbdocument>
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_clock_unlocked.docml Fri Sep 17 08:29:05 2010 +0300
@@ -1,57 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="1.1">
<object name="snoozeAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
+ <string name="text" value="Snooze"/>
</object>
<object name="stopAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
+ <string name="text" value="Stop"/>
</object>
<widget name="dialog" type="HbDialog">
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
<widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
<enums name="alignment" value="AlignLeft|AlignLeading"/>
- <string locid="txt_calendar_title_clock_alarm" name="plainText" value="Clock alarm"/>
+ <string name="plainText" value="Clock alarm"/>
</widget>
<widget name="container" role="HbDialog:contentWidget" type="HbWidget">
<widget name="alarmTime" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="1"/>
- <sizehint height="10un" type="MINIMUM"/>
- <string name="plainText" value="9:00 am"/>
- <fontspec name="fontSpec" role="Primary" textheight="9.8un"/>
- <sizehint height="10un" type="PREFERRED"/>
+ <sizehint type="PREFERRED" width="26.98508un"/>
+ <string name="plainText" value="Hello!"/>
</widget>
<widget name="alarmDescription" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="3"/>
- <sizehint height="expr(2 * var(hb-param-text-height-secondary) )" type="PREFERRED"/>
- <sizehint height="7un" type="MINIMUM"/>
- <sizehint height="7un" type="MAXIMUM"/>
- <string name="textFormat" value="PlainText"/>
+ <real name="z" value="1"/>
+ <string name="plainText" value="popup says alarm description from docml !!"/>
</widget>
<widget name="alarmIcon" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
<icon iconName="qtg_large_bell" name="icon"/>
- <real name="z" value="5"/>
+ <real name="z" value="2"/>
<sizehint height="15un" type="PREFERRED" width="15un"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
</widget>
<layout type="anchor">
- <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmTime" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmTime" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDescription" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="2un" src="alarmTime" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-14.65672un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="2un" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="RIGHT" spacing="-9.28358un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-2un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ </widget>
+ <section name="portrait">
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(2 * var(hb-param-text-height-secondary) )" type="PREFERRED"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmTime" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
<anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
</layout>
</widget>
- <ref object="snoozeAction" role="HbWidget:addAction"/>
- <ref object="stopAction" role="HbWidget:addAction"/>
- </widget>
- <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+ <widget name="alarmTime" type="HbLabel">
+ <sizehint height="9.8un" type="PREFERRED" width="26.98508un"/>
+ <fontspec name="fontSpec" role="Primary" textheight="9.8un"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <icon iconName="qtg_large_bell" name="icon"/>
+ <bool name="visible" value="TRUE"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ </widget>
+ </section>
+ <section name="landscape">
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(2 * var(hb-param-text-height-secondary))" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmTime" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <widget name="alarmTime" type="HbLabel">
+ <sizehint height="9.8un" type="PREFERRED" width="26.98508un"/>
+ <fontspec name="fontSpec" role="Primary" textheight="9.8un"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <bool name="visible" value="FALSE"/>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ </widget>
+ </section>
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
+ <uistate name="portrait" sections="#common portrait"/>
+ <uistate name="landscape" sections="#common landscape"/>
</metadata>
</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_nontimed_calendar_unlocked.docml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <object name="snoozeAction" type="HbAction">
+ <string name="text" value="Snooze"/>
+ </object>
+ <object name="stopAction" type="HbAction">
+ <string name="text" value="Stop"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
+ <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <string name="plainText" value="Calendar alarm"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="alarmDate" type="HbLabel">
+ <real name="z" value="1"/>
+ <string name="plainText" value="Popup says alarm date"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <real name="z" value="2"/>
+ <string name="plainText" value="Popup says alarm description"/>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <real name="z" value="3"/>
+ <string name="plainText" value="alarm location"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="qtg_small_smiley_very_cool" name="icon"/>
+ <real name="z" value="4"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="15un" type="FIXED" width="15un"/>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="2.53731un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="BOTTOM" spacing="-4.92537un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="19.10448un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="BOTTOM" spacing="-7.46269un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="10.59702un" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="6.23881un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="LEFT" spacing="5.97015un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="1.19403un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ </widget>
+ <section name="nonTimedAlarmPortrait">
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmLocation" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+ </layout>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(3 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <icon iconName="qtg_large_calendar_alarm" name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ </section>
+ <section name="nonTimedAlarmLandscape">
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="2un" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="BOTTOM" spacing="-2un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(3 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <bool name="visible" value="FALSE"/>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ </section>
+ <metadata activeUIState="nonTimedAlarmPortrait" display="NHD-3.2-inch_portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="nonTimedAlarmPortrait" sections="#common nonTimedAlarmPortrait"/>
+ <uistate name="nonTimedAlarmLandscape" sections="#common nonTimedAlarmLandscape"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_timed_calendar_unlocked.docml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <object name="snoozeAction" type="HbAction">
+ <string name="text" value="Snooze"/>
+ </object>
+ <object name="stopAction" type="HbAction">
+ <string name="text" value="Stop"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
+ <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <string name="plainText" value="Calendar Alarm"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="alarmTime" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint type="PREFERRED" width="24.29851un"/>
+ <string name="plainText" value="Popup says alarmtime"/>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <real name="z" value="1"/>
+ <string name="plainText" value="alarm date"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <real name="z" value="2"/>
+ <string name="plainText" value="alarm description"/>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <real name="z" value="3"/>
+ <string name="plainText" value="alarm location"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="qtg_small_smiley_very_cool" name="icon"/>
+ <real name="z" value="4"/>
+ <sizehint height="15un" type="PREFERRED" width="15un"/>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="1.34328un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="1.34328un" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="1.9403un" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-10.02985un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="3.13433un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="BOTTOM" spacing="-5.07463un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="-11.22388un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="BOTTOM" spacing="-3.43284un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="LEFT" spacing="7.46269un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="1.34328un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ </widget>
+ <section name="timedAlarmportrait">
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmTime" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmLocation" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+ </layout>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWrapAnywhere"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(2 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <icon iconName="qtg_large_calendar_alarm" name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="alarmTime" type="HbLabel">
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED" width="24.29851un"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ </section>
+ <section name="timedAlarmLandscape">
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmTime" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmTime" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmTime" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmTime" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmLocation" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmLocation" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmLocation" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <widget name="alarmLocation" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(2 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="alarmIcon" type="HbLabel">
+ <bool name="visible" value="FALSE"/>
+ </widget>
+ <widget name="alarmTime" type="HbLabel">
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED" width="24.29851un"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ </section>
+ <metadata activeUIState="timedAlarmLandscape" display="NHD-3.2-inch_landscape" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="timeAlarmPortrait" sections="#common timedAlarmportrait"/>
+ <uistate name="timedAlarmLandscape" sections="#common timedAlarmLandscape"/>
+ </metadata>
+</hbdocument>
--- a/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml Fri Sep 17 08:29:05 2010 +0300
@@ -1,56 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="1.1">
<object name="snoozeAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_snooze" name="text" value="Snooze"/>
+ <string name="text" value="Snooze"/>
</object>
<object name="stopAction" type="HbAction">
- <string locid="txt_calendar_button_alarm_stop" name="text" value="Stop"/>
+ <string name="text" value="Stop"/>
</object>
<widget name="dialog" type="HbDialog">
+ <ref object="snoozeAction" role="HbWidget:addAction"/>
+ <ref object="stopAction" role="HbWidget:addAction"/>
<widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
<enums name="alignment" value="AlignLeft|AlignLeading"/>
- <string locid="txt_calendar_title_todo_note_alarm" name="plainText" value="To-do note"/>
+ <string name="plainText" value="Todo Alarm"/>
</widget>
<widget name="container" role="HbDialog:contentWidget" type="HbWidget">
<widget name="alarmDate" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="2"/>
- <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
- <string name="plainText" value="01/01/2010"/>
+ <sizehint type="PREFERRED" width="26.98508un"/>
+ <string name="plainText" value="Popup says Hello!"/>
</widget>
<widget name="alarmDescription" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <real name="z" value="3"/>
- <sizehint height="16un" type="PREFERRED"/>
- <sizehint height="16un" type="MINIMUM"/>
- <sizehint height="expr(4 * var(hb-param-text-height-primary) )" type="MAXIMUM"/>
- <string name="textFormat" value="PlainText"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Maximum" verticalStretch="0"/>
+ <real name="z" value="1"/>
+ <string name="plainText" value="pop says description"/>
</widget>
<widget name="alarmIcon" type="HbLabel">
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
- <icon iconName="qtg_large_todo_alarm" name="icon"/>
- <real name="z" value="5"/>
- <sizehint height="15un" type="PREFERRED" width="15un"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <icon iconName="qtg_small_smiley_very_cool" name="icon"/>
+ <real name="z" value="2"/>
</widget>
<layout type="anchor">
- <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDate" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDate" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="alarmDescription" srcEdge="BOTTOM"/>
- <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="1.34328un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="1.34328un" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="5.22388un" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-11.97015un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="LEFT" spacing="17.46269un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="1.49254un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ </widget>
+ <section name="portrait">
+ <widget name="alarmIcon" type="HbLabel">
+ <icon iconName="qtg_large_todo_alarm" name="icon"/>
+ <sizehint height="15un" type="PREFERRED" width="15un"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(4 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmIcon" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDescription" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmIcon" dstEdge="BOTTOM" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
<anchoritem dst="alarmIcon" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
</layout>
</widget>
- <ref object="snoozeAction" role="HbWidget:addAction"/>
- <ref object="stopAction" role="HbWidget:addAction"/>
- </widget>
- <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ </widget>
+ </section>
+ <section name="landscape">
+ <widget name="alarmIcon" type="HbLabel">
+ <bool name="visible" value="FALSE"/>
+ </widget>
+ <widget name="alarmDescription" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="expr(4 * var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="alarmDate" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDate" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="alarmDate" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="alarmDescription" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="alarmDate" srcEdge="BOTTOM"/>
+ <anchoritem dst="alarmDescription" dstEdge="RIGHT" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="alarmDescription" dstEdge="BOTTOM" spacing="-expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <widget name="alarmDate" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="dialog" type="HbDialog">
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ </widget>
+ </section>
+ <metadata activeUIState="landscape" display="NHD-3.2-inch_landscape" unit="un">
<uistate name="Common ui state" sections="#common"/>
+ <uistate name="portrait" sections="#common portrait"/>
+ <uistate name="landscape" sections="#common landscape"/>
</metadata>
</hbdocument>
--- a/alarmui/alarmalertwidget/alarmalertplugin/inc/alarmalertwidget_p.h Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/inc/alarmalertwidget_p.h Fri Sep 17 08:29:05 2010 +0300
@@ -36,7 +36,10 @@
class HbAction;
class AlarmAlertDocLoader;
-const QString alarmNormalUICalendarDocml(":/xml/alarmalert_calendar_unlocked.docml");
+const QString alarmNormalUICalendarDocml(
+ ":/xml/alarmalert_timed_calendar_unlocked.docml");
+const QString alarmNormalUINonTimedCalendarDocml(
+ ":/xml/alarmalert_nontimed_calendar_unlocked.docml");
const QString alarmNormalUIClockDocml(":/xml/alarmalert_clock_unlocked.docml");
const QString alarmNormalUITodoDocml(":/xml/alarmalert_todo_unlocked.docml");
@@ -105,7 +108,7 @@
* @brief From QGraphicsWidget
* @see QGraphicsWidget
*/
- void closeEvent(QCloseEvent *event);
+ void hideEvent(QHideEvent *event);
signals:
@@ -124,7 +127,7 @@
/**
* @brief Callback function for handling orientation changes
*/
- void handleOrientationChange();
+ void handleOrientationChange(Qt::Orientation orientation);
/**
* @brief Called when the user snoozes the alarm
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertplugin.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -155,24 +155,35 @@
QVariantMap::const_iterator iter = parameters.constBegin();
int count = parameters.size();
AlarmType alertType = OtherAlarm;
+ bool isTimedAlarm = false;
while (iter != parameters.constEnd()) {
QString key(iter.key());
if (alarmType == key) {
alertType = static_cast <AlarmType> (iter.value().toInt());
}
+ if (alarmIsTimed == key) {
+ isTimedAlarm = iter.value().toBool();
+ }
iter++;
}
+
bool loadSuccess = false;
if (alertType == ClockAlarm) {
alertDocLoader->load(alarmNormalUIClockDocml, &loadSuccess);
}else if (alertType == TodoAlarm) {
alertDocLoader->load(alarmNormalUITodoDocml, &loadSuccess);
}else if(alertType == CalendarAlarm) {
- alertDocLoader->load(alarmNormalUICalendarDocml, &loadSuccess);
+ if (isTimedAlarm) {
+ alertDocLoader->load(alarmNormalUICalendarDocml, &loadSuccess);
+ } else {
+ alertDocLoader->load(
+ alarmNormalUINonTimedCalendarDocml, &loadSuccess);
+ }
}
if(!loadSuccess) {
qFatal("Unable to load the docml");
}
+ // Transfer the ownership of docloader object to alarmalertdialogprivate.
AlarmAlertDialogPrivate *alertDialog = qobject_cast<AlarmAlertDialogPrivate*> (alertDocLoader->findWidget("dialog"));
alertDialog->setupNormalUI(alertDocLoader);
ret = alertDialog;
--- a/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget_p.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -166,27 +166,16 @@
}
// ---------------------------------------------------------
-// AlarmAlertDialogPrivate::closeEvent
+// AlarmAlertDialogPrivate::hideEvent
// rest of the details are commented in the header
// ---------------------------------------------------------
//
-void AlarmAlertDialogPrivate::closeEvent(QCloseEvent *event)
+void AlarmAlertDialogPrivate::hideEvent(QHideEvent *event)
{
- OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY );
-
- // Do not notify the client back if the close was initiated by client itself
- if(!mClosedByClient) {
- // Package the user response and send it
- QVariantMap param;
- param.insert(alarmCommand, mUserResponse);
- emit deviceDialogData(param);
- }
- // This signal has to be emitted so that the dialog can be cleaned up later
- emit deviceDialogClosed();
-
- // Forward the call to the base class
- HbDialog::closeEvent(event);
- OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT );
+ OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY );
+ HbDialog::hideEvent(event);
+ emit deviceDialogClosed();
+ OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT );
}
// ---------------------------------------------------------
@@ -194,10 +183,44 @@
// rest of the details are commented in the header
// ---------------------------------------------------------
//
-void AlarmAlertDialogPrivate::handleOrientationChange ()
+void AlarmAlertDialogPrivate::handleOrientationChange(Qt::Orientation orientation)
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY );
- // TODO: Need to change this as per the UI concept
+ QString section;
+ QString filename;
+ if (orientation == Qt::Horizontal) {
+ section = "landscape";
+ } else {
+ section = "portrait";
+ }
+ bool loadSuccess = false;
+ switch (mAlarmAlertType) {
+ case ClockAlarm:
+ mAlertDocLoader->load(alarmNormalUIClockDocml, section, &loadSuccess);
+ break;
+ case TodoAlarm:
+ mAlertDocLoader->load(alarmNormalUITodoDocml, section, &loadSuccess);
+ break;
+ case CalendarAlarm:
+ if (mIsTimedAlarm) {
+ filename = alarmNormalUICalendarDocml;
+ section = "timedAlarmportrait";
+ if(orientation == Qt::Horizontal) {
+ section = "timedAlarmLandscape";
+ }
+ } else {
+ filename = alarmNormalUINonTimedCalendarDocml;
+ section = "nonTimedAlarmPortrait";
+ if(orientation == Qt::Horizontal) {
+ section = "nonTimedAlarmLandscape";
+ }
+ }
+ mAlertDocLoader->load(filename, section, &loadSuccess);
+ break;
+ default:
+ break;
+ }
+
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT );
}
@@ -210,7 +233,10 @@
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY );
mUserResponse = Snooze;
- close();
+ QVariantMap param;
+ param.insert(alarmCommand, mUserResponse);
+ emit deviceDialogData(param);
+
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SNOOZED_EXIT );
}
@@ -226,12 +252,13 @@
mUserResponse = Silence;
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze"));
mIsSilenceKey = false;
+ setDismissOnAction(true);
QVariantMap param;
param.insert(alarmCommand, mUserResponse);
emit deviceDialogData(param);
}else {
- mUserResponse = Snooze;
- close();
+ snoozed();
+
}
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_SILENCED_EXIT );
}
@@ -260,7 +287,9 @@
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_DISMISSED_ENTRY );
mUserResponse = Stop;
- close();
+ QVariantMap param;
+ param.insert(alarmCommand, mUserResponse);
+ emit deviceDialogData(param);
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_DISMISSED_EXIT );
}
@@ -316,6 +345,11 @@
return;
}
mAlertDocLoader = alertDocLoader;
+
+ mMainWindow = hbInstance->allMainWindows().first();
+ connect(
+ mMainWindow, SIGNAL(orientationChanged(Qt::Orientation)),
+ this, SLOT(handleOrientationChange(Qt::Orientation)));
if (mAlarmAlertType == ClockAlarm) {
handleClockAlarms();
@@ -335,6 +369,9 @@
void AlarmAlertDialogPrivate::handleClockAlarms()
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECLOCKALARMS_ENTRY );
+
+ handleOrientationChange(mMainWindow->orientation());
+
QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
if (!headingWidget) {
qFatal("Unable to load the heading Widget");
@@ -368,7 +405,6 @@
qFatal("Unable to load the snoozeAction softkey");
}
snoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze"));
- disconnect(snoozeAction, SIGNAL(triggered()), this, SLOT(close()));
connect(snoozeAction, SIGNAL(triggered()), this, SLOT(snoozed()));
HbAction *stopAction = qobject_cast<HbAction*> (
@@ -377,7 +413,6 @@
qFatal("Unable to load the stopAction softkey");
}
stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
- disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
if (!mCanSnooze) {
@@ -394,17 +429,12 @@
void AlarmAlertDialogPrivate::handleCalendarAlarms()
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_ENTRY );
- bool success = false;
HbExtendedLocale locale = HbExtendedLocale::system();
// Check if the alarm has the time info or not.
// For all day events the time label has to be hidden
// So load the proper sections accordingly
if ( mIsTimedAlarm ) {
- mAlertDocLoader->load(
- alarmNormalUICalendarDocml, "calendarTimed",&success);
- if (!success) {
- qFatal("Unable to load the calendarTimed section");
- }
+ handleOrientationChange(mMainWindow->orientation());
mAlarmDateTime = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmTime"));
if (!mAlarmDateTime) {
@@ -418,17 +448,7 @@
}
alarmDate->setPlainText(mAlarmDate);
}else {
- mAlertDocLoader->load(
- alarmNormalUICalendarDocml, "nonTimedAlarm",&success);
- if (!success) {
- qFatal("Unable to load the nonTimedAlarm section");
- }
- mAlarmDateTime = qobject_cast<HbLabel*> (
- mAlertDocLoader->findWidget("alarmTime"));
- if (!mAlarmDateTime) {
- qFatal("Unable to find the alarmTime label");
- }
- mAlarmDateTime->hide();
+ handleOrientationChange(mMainWindow->orientation());
HbLabel *alarmDate = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmDate"));
if (!alarmDate) {
@@ -437,10 +457,6 @@
alarmDate->setPlainText(mAlarmDate);
}
- QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
- if (!headingWidget) {
- qFatal("Unable to find the heading widget");
- }
mAlarmDescription = qobject_cast<HbLabel*> (
mAlertDocLoader->findWidget("alarmDescription"));
if (!mAlarmDescription) {
@@ -466,7 +482,7 @@
if (!mSnoozeAction) {
qFatal("Unable to find the snoozeAction softkey");
}
- disconnect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(close()));
+
if (!mCanSnooze) {
mSnoozeAction->setVisible(false);
}else {
@@ -474,6 +490,7 @@
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_silence"));
connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(silenced()));
mIsSilenceKey = true;
+ setDismissOnAction(false);
} else {
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze"));
connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(snoozed()));
@@ -485,7 +502,6 @@
qFatal("Unable to find the stopAction softkey");
}
stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
- disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT );
}
@@ -498,6 +514,9 @@
void AlarmAlertDialogPrivate::handleToDoAlarms()
{
OstTraceFunctionEntry0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY );
+
+ handleOrientationChange(mMainWindow->orientation());
+
QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
if (!headingWidget) {
qFatal("Unable to load the heading widget");
@@ -528,7 +547,7 @@
if (!mSnoozeAction) {
qFatal("Unable to load the snoozeAction softkey");
}
- disconnect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(close()));
+
if (!mCanSnooze) {
mSnoozeAction->setVisible(false);
}else {
@@ -536,6 +555,7 @@
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_silence"));
connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(silenced()));
mIsSilenceKey = true;
+ setDismissOnAction(false);
} else {
mSnoozeAction->setText(hbTrId("txt_calendar_button_alarm_snooze"));
connect(mSnoozeAction, SIGNAL(triggered()), this, SLOT(snoozed()));
@@ -547,7 +567,6 @@
qFatal("Unable to load the stopAction softkey");
}
stopAction->setText(hbTrId("txt_calendar_button_alarm_stop"));
- disconnect(stopAction, SIGNAL(triggered()), this, SLOT(close()));
connect(stopAction, SIGNAL(triggered()), this, SLOT(dismissed()));
OstTraceFunctionExit0( ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT );
}
--- a/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/OstTraceDefinitions.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef __OSTTRACEDEFINITIONS_H__
#define __OSTTRACEDEFINITIONS_H__
// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertdocloaderTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,10 +1,26 @@
-// Created by TraceCompiler 2.2.3
+/*
+ * 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: Definition file for class AlarmAlertDocLoader.
+ *
+ */
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __ALARMALERTDOCLOADERTRACES_H__
#define __ALARMALERTDOCLOADERTRACES_H__
-#define KOstTraceComponentID 0xe3ae7edb
+#define KOstTraceComponentID 0xe3ab5737
#define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_ENTRY 0x8a0001
#define ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT 0x8a0002
--- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertpluginTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,10 +1,26 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __ALARMALERTPLUGINTRACES_H__
#define __ALARMALERTPLUGINTRACES_H__
-#define KOstTraceComponentID 0xe3ae7edb
+#define KOstTraceComponentID 0xe3ab5737
#define ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY 0x8a0007
#define ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT 0x8a0008
--- a/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/alarmalertwidget_pTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,10 +1,26 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __ALARMALERTWIDGET_PTRACES_H__
#define __ALARMALERTWIDGET_PTRACES_H__
-#define KOstTraceComponentID 0xe3ae7edb
+#define KOstTraceComponentID 0xe3ab5737
#define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_ENTRY 0x8a0017
#define ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT 0x8a0018
@@ -19,8 +35,6 @@
#define ALARMALERTDIALOGPRIVATE_DEVICEDIALOGWIDGET_ENTRY 0x8a0021
#define ALARMALERTDIALOGPRIVATE_SHOWEVENT_ENTRY 0x8a0022
#define ALARMALERTDIALOGPRIVATE_SHOWEVENT_EXIT 0x8a0023
-#define ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY 0x8a0024
-#define ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT 0x8a0025
#define ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_ENTRY 0x8a0026
#define ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT 0x8a0027
#define ALARMALERTDIALOGPRIVATE_SNOOZED_ENTRY 0x8a0028
@@ -42,6 +56,8 @@
#define ALARMALERTDIALOGPRIVATE_HANDLECALENDARALARMS_EXIT 0x8a0038
#define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY 0x8a0039
#define ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT 0x8a003a
+#define ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY 0x8a003b
+#define ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT 0x8a003c
#endif
--- a/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/alarmui/alarmalertwidget/alarmalertplugin/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+##
+# This is Default Licence added by TraceCompiler
+# 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:
+#
+##
#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
[GROUP]TRACE_FLOW=0x8a
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ABOUTTODISPLAY_ENTRY=0x2c
@@ -6,8 +23,6 @@
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_ALARMALERTDIALOGPRIVATE_EXIT=0x18
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_ENTRY=0x1f
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEDEVICEDIALOG_EXIT=0x20
-[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY=0x24
-[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT=0x25
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_ENTRY=0x1d
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGERROR_EXIT=0x1e
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_DEVICEDIALOGWIDGET_ENTRY=0x21
@@ -21,6 +36,8 @@
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLEORIENTATIONCHANGE_EXIT=0x27
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_ENTRY=0x39
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HANDLETODOALARMS_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HIDEEVENT_ENTRY=0x3b
+[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_HIDEEVENT_EXIT=0x3c
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_ENTRY=0x30
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_PARSEANDFETCHPARAMS_EXIT=0x31
[TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_SETDEVICEDIALOGPARAMETERS_ENTRY=0x1b
@@ -58,3 +75,5 @@
[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTDOCLOADER_ALARMALERTDOCLOADER_EXIT=0x4
[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_ENTRY=0x9
[TRACE]TRACE_FLOW[0x8A]_DUP1_ALARMALERTPLUGIN_ALARMALERTPLUGIN_EXIT=0xa
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_ENTRY=0x24
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_ALARMALERTDIALOGPRIVATE_CLOSEEVENT_EXIT=0x25
--- a/calendarui/agendaeventviewer/data/agendaeventvieweritem.css Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/data/agendaeventvieweritem.css Fri Sep 17 08:29:05 2010 +0300
@@ -1,80 +1,55 @@
-
-AgendaEventViewerItem[leftPrimaryIconItem="true"]:portrait {
- layout: layout-eventvieweritem-stretch;
- fixed-width: var(hb-param-screen-width);
+AgendaEventViewerItem {
+ layout: layout-eventvieweritem;
}
-AgendaEventViewerItem[leftPrimaryIconItem="true"]:landscape {
- layout: layout-eventvieweritem-stretch;
- fixed-width: var(hb-param-screen-width);
+AgendaEventViewerItem:portrait {
+ fixed-width: var(hb-param-screen-width);
}
-
-AgendaEventViewerItem:portrait {
- layout: layout-eventvieweritem;
- fixed-width: var(hb-param-screen-width);
+AgendaEventViewerItem:landscape {
+ fixed-width: var(hb-param-screen-width);
}
-AgendaEventViewerItem:landscape {
- layout: layout-eventvieweritem;
- fixed-width: var(hb-param-screen-width);
+AgendaEventViewerItem::primaryLeftIconItem {
+ fixed-width:var(hb-param-graphic-size-primary-small);
+ fixed-height:var(hb-param-graphic-size-primary-small);
+ top: -var(hb-param-margin-gene-top);
+ left: -var(hb-param-margin-gene-left);
}
-
-AgendaEventViewerItem::primaryLeftIconItem {
- fixed-width:var(hb-param-graphic-size-primary-small);
- fixed-height:var(hb-param-graphic-size-primary-small);
- top: -var(hb-param-margin-gene-top);
- left: -var(hb-param-margin-gene-left);
-
-
-}
-
-AgendaEventViewerItem::primaryRightIconItem {
- fixed-width:var(hb-param-graphic-size-secondary);
- fixed-height:var(hb-param-graphic-size-secondary);
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-right);
+AgendaEventViewerItem::primaryTextItem {
+ text-height: var(hb-param-text-height-primary);
+ font-variant: primary;
+ text-align: left;
+ top: -var(hb-param-margin-gene-top);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ left: -var(hb-param-margin-gene-middle-horizontal);
}
-AgendaEventViewerItem::secondaryIconItem {
- fixed-width:var(hb-param-graphic-size-primary-small);
- fixed-height:var(hb-param-graphic-size-primary-small);
- left: -var(hb-param-margin-gene-left);
-
+AgendaEventViewerItem::primaryRightIconItem {
+ fixed-width:var(hb-param-graphic-size-secondary);
+ fixed-height:var(hb-param-graphic-size-secondary);
+ right: var(hb-param-margin-gene-right);
+}
+
+AgendaEventViewerItem::secondaryLeftIconItem {
+ fixed-width:var(hb-param-graphic-size-primary-small);
+ fixed-height:var(hb-param-graphic-size-primary-small);
+ left: -var(hb-param-margin-gene-left);
}
-AgendaEventViewerItem::primaryTextItem[leftPrimaryIconItem="true"] {
- text-height: var(hb-param-text-height-primary);
- font-variant: primary;
- text-align: left;
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
- left: -var(hb-param-margin-gene-middle-horizontal);
-}
-AgendaEventViewerItem::primaryTextItem[leftPrimaryIconItem="false"] {
- text-height: var(hb-param-text-height-primary);
- font-variant: primary;
- text-align: left;
- top: -var(hb-param-margin-gene-top);
- right: var(hb-param-margin-gene-middle-horizontal);
-
-
+AgendaEventViewerItem::secondaryTextItem {
+ text-height: var(hb-param-text-height-secondary);
+ font-variant: secondary;
+ text-align: left;
+ right: var(hb-param-margin-gene-middle-horizontal);
+ bottom: var(hb-param-margin-gene-bottom);
+ top: -var(hb-param-margin-gene-middle-vertical);
+ left: -var(hb-param-margin-gene-middle-horizontal);
}
-AgendaEventViewerItem::secondaryTextItem[leftPrimaryIconItem="true"]{
- text-height: var(hb-param-text-height-secondary);
- font-variant: secondary;
- text-align: left;
- top: -var(hb-param-margin-gene-middle-vertical);
- right: var(hb-param-margin-gene-right);
- bottom: var(hb-param-margin-gene-bottom);
+
+AgendaEventViewerItem::secondaryRightIconItem {
+ fixed-width:var(hb-param-graphic-size-secondary);
+ fixed-height:var(hb-param-graphic-size-secondary);
+ right: var(hb-param-margin-gene-right);
}
-AgendaEventViewerItem::secondaryTextItem[leftPrimaryIconItem="false"] {
- text-height: var(hb-param-text-height-secondary);
- font-variant: secondary;
- text-align: left;
- top: -var(hb-param-margin-gene-middle-vertical);
- right: var(hb-param-margin-gene-right);
- bottom: var(hb-param-margin-gene-bottom);
- left: -var(hb-param-margin-gene-middle-horizontal);
-}
--- a/calendarui/agendaeventviewer/data/agendaeventvieweritem.widgetml Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/data/agendaeventvieweritem.widgetml Fri Sep 17 08:29:05 2010 +0300
@@ -1,41 +1,34 @@
<hbwidget type="AgendaEventViewerItem" version="0.1">
- <layout name="layout-eventvieweritem" type="mesh">
- <meshitem src="primaryTextItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="primaryTextItem" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="primaryTextItem" srcEdge="LEFT" dst="secondaryTextItem" dstEdge="LEFT" />
-
- <meshitem src="primaryIconItem" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="primaryIconItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="secondaryIconItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="secondaryIconItem" srcEdge="TOP" dst="secondaryTextItem" dstEdge="TOP" />
-
- <meshitem src="secondaryTextItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- <meshitem src="secondaryTextItem" srcEdge="TOP" dst="primaryTextItem" dstEdge="BOTTOM" />
- <meshitem src="secondaryTextItem" srcEdge="LEFT" dst="secondaryIconItem" dstEdge="RIGHT" />
- <meshitem src="secondaryTextItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
- </layout>
-
- <layout name="layout-eventvieweritem-stretch" type="mesh">
+<!-- layout-eventvieweritem -->
+ <!--
+ Items from left to right:
+ <- primaryLeftIconItem -> primaryTextItem -> primaryRightIconItem->
+ <- secondaryLeftIconItem -> secondaryTextItem -> secondaryRightIconItem->
+ -->
-
- <meshitem src="primaryLeftIconItem" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="primaryLeftIconItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <layout name="layout-eventvieweritem" type="mesh">
+
+ <meshitem src="primaryLeftIconItem" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="primaryLeftIconItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+
+ <meshitem src="primaryTextItem" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="primaryTextItem" srcEdge="LEFT" dst="primaryLeftIconItem" dstEdge="RIGHT" />
+ <meshitem src="primaryTextItem" srcEdge="RIGHT" dst="primaryRightIconItem" dstEdge="LEFT" />
- <meshitem src="primaryTextItem" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="primaryTextItem" srcEdge="LEFT" dst="primaryLeftIconItem" dstEdge="RIGHT" />
-
- <meshitem src="primaryRightIconItem" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="primaryRightIconItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="primaryRightIconItem" srcEdge="CENTERV" dst="primaryTextItem" dstEdge="CENTERV" />
+ <meshitem src="primaryRightIconItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="secondaryIconItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="secondaryIconItem" srcEdge="TOP" dst="secondaryTextItem" dstEdge="TOP" />
+ <meshitem src="secondaryLeftIconItem" srcEdge="TOP" dst="secondaryTextItem" dstEdge="TOP" />
+ <meshitem src="secondaryLeftIconItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+
+ <meshitem src="secondaryTextItem" srcEdge="TOP" dst="primaryTextItem" dstEdge="BOTTOM" />
+ <meshitem src="secondaryTextItem" srcEdge="RIGHT" dst="secondaryRightIconItem" dstEdge="LEFT" />
+ <meshitem src="secondaryTextItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="secondaryTextItem" srcEdge="LEFT" dst="secondaryLeftIconItem" dstEdge="RIGHT" />
- <meshitem src="secondaryTextItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- <meshitem src="secondaryTextItem" srcEdge="TOP" dst="primaryTextItem" dstEdge="BOTTOM" />
- <meshitem src="secondaryTextItem" srcEdge="LEFT" dst="primaryTextItem" dstEdge="LEFT" />
- <meshitem src="secondaryTextItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="secondaryRightIconItem" srcEdge="TOP" dst="secondaryTextItem" dstEdge="TOP" />
+ <meshitem src="secondaryRightIconItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- </layout>
+ </layout>
</hbwidget>
\ No newline at end of file
--- a/calendarui/agendaeventviewer/inc/agendaeventview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/inc/agendaeventview.h Fri Sep 17 08:29:05 2010 +0300
@@ -124,7 +124,7 @@
AgendaEntry mOriginalAgendaEntry;
AgendaEntry mAgendaEntry;
QPointer<QPluginLoader> mNotesEditorPluginLoader;
- CalenEditor *mCalenEditor;
+ QPointer<CalenEditor> mCalenEditor;
QGraphicsLinearLayout *mLinearLayout;
HbTranslator *mTranslator;
@@ -140,6 +140,8 @@
bool mCalenEditorClosed ;
int mMaptileStatus;
bool mNotesPluginLoaded;
+ ulong mParentId;
+ ulong mEntryIdDeleted;
private:
friend class AgendaEventViewerPrivate;
--- a/calendarui/agendaeventviewer/inc/agendaeventvieweritem.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/inc/agendaeventvieweritem.h Fri Sep 17 08:29:05 2010 +0300
@@ -36,15 +36,17 @@
public:
void setEventViewerItemData(const QStringList & itemData, int role);
+ void setTextItemData(int index, const QString &itemData);
+ void setIconItemData(int index, const QString &itemData);
private:
HbTextItem *mPrimaryText;
HbTextItem *mSecondaryText;
- HbIconItem *mPrimaryIcon;
- HbIconItem *mSecondaryIcon;
+ HbIconItem *mPrimaryLeftIcon;
HbIconItem *mPrimaryRightIcon;
- HbIconItem *mPrimaryLeftIcon;
+ HbIconItem *mSecondaryLeftIcon;
+ HbIconItem *mSecondaryRightIcon;
};
--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -62,10 +62,7 @@
// Constants
#define CHARACTER_SPACE " "
#define CHARACTER_HYPHEN " - "
-
-
-//This Property is use for setting a primary left icon
-static const char *primaryLeftIconItem("leftPrimaryIconItem");
+#define DUMMY_ICON "dummyIcon"
/*!
\class AgendaEventView.
@@ -93,9 +90,10 @@
mProgressTimer(NULL),
mProgressIconCount(0),
mMaptileStatusReceived(false),
+ mCalenEditorClosed(true),
mMaptileStatus(-1),
mNotesPluginLoaded(false),
- mCalenEditorClosed(true)
+ mEntryIdDeleted(0)
{
OstTraceFunctionEntry0( AGENDAEVENTVIEW_AGENDAEVENTVIEW_ENTRY );
mTranslator->loadCommon();
@@ -115,9 +113,6 @@
mSubjectWidget = qobject_cast<AgendaEventViewerItem *> (
mDocLoader->findWidget(AGENDA_EVENT_VIEWER_SUBJECT_WIDGET));
- //load layout that supports icon before subject label
- mSubjectWidget->setProperty(primaryLeftIconItem,true);
-
mDateTimeWidget = qobject_cast<AgendaEventViewerItem *> (
mDocLoader->findWidget(AGENDA_EVENT_VIEWER_DATE_TIME_WIDGET));
@@ -214,7 +209,10 @@
mOriginalAgendaEntry = entry;
mAgendaEntry = entry;
-
+
+ // For later reference
+ mParentId = mOwner->mAgendaUtil->parentEntry(mAgendaEntry).id();
+
// Add the viewer data reading from the agenda entry.
addViewerData();
@@ -247,11 +245,11 @@
mMainWindow = new HbMainWindow();
mMainWindow->addView(mViewer);
mMainWindow->setCurrentView(mViewer);
- connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
+ connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
} else {
window->addView(mViewer);
window->setCurrentView(mViewer);
- connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
+ connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
}
// Add softkey after adding view on window
@@ -419,6 +417,8 @@
getSubjectIcon(mAgendaEntry.type(),subjectIcon);
itemList.append(subjectIcon);
itemList.append(priorityIcon);
+ // This "DUMMY_ICON" is required only for the subject layout.
+ itemList.append(DUMMY_ICON);
itemList.append(QString::null);
mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
@@ -441,8 +441,7 @@
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append("qtg_small_calendar");
-
- mDateTimeWidget->setProperty(primaryLeftIconItem, false);
+ itemData.append(QString::null);
mDateTimeWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
@@ -527,21 +526,18 @@
{
OstTraceFunctionEntry0( AGENDAEVENTVIEW_ADDLOCATIONDATA_ENTRY );
QStringList itemData;
+ itemData.append(QString::null);
+ itemData.append(QString::null);
+ itemData.append("qtg_small_location");
QString progressIcon(QString::null);
if ( mLocationFeatureEnabled ) {
getProgressIndicatorstatus(progressIcon);
}
if( progressIcon.isNull() ) {
itemData.append(QString::null);
- itemData.append(QString::null);
- itemData.append("qtg_small_location");
- mLocationWidget->setProperty(primaryLeftIconItem, false);
}
else {
- itemData.append("qtg_small_location");
- itemData.append( progressIcon );
- itemData.append(QString::null);
- mLocationWidget->setProperty(primaryLeftIconItem, true);
+ itemData.append( progressIcon );
}
mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
@@ -579,7 +575,7 @@
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append("qtg_small_reminder");
- mReminderWidget->setProperty(primaryLeftIconItem, false);
+ itemData.append(QString::null);
mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
itemData.append(QString::null);
@@ -601,7 +597,7 @@
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append(QString::null);
- mReminderWidget->setProperty(primaryLeftIconItem, true);
+ itemData.append(QString::null);
mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
@@ -626,7 +622,7 @@
}else {
itemData.append("qtg_small_repeat");
}
- mRepeatWidget->setProperty(primaryLeftIconItem, false);
+ itemData.append(QString::null);
mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
itemData.append(QString::null);
@@ -645,7 +641,7 @@
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append(QString::null);
- mDescriptionWidget->setProperty(primaryLeftIconItem, true);
+ itemData.append(QString::null);
mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
itemData.clear();
itemData.append(hbTrId("txt_calendar_dblist_description"));
@@ -934,6 +930,9 @@
{
OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY );
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -977,6 +976,9 @@
OstTraceFunctionEntry0( AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY );
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popup->setParent(this);
popup->setDismissPolicy(HbDialog::NoDismiss);
popup->setTimeout(HbDialog::NoTimeout);
popup->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -1016,7 +1018,7 @@
popup->removeAction(list[i]);
}
HbAction *deleteAction =
- new HbAction(hbTrId("txt_calendar_button_delete"), popup);
+ new HbAction(hbTrId("txt_common_button_delete"), popup);
popup->addAction(deleteAction);
connect(deleteAction, SIGNAL(triggered()), this ,
SLOT(handleDeleteAction()));
@@ -1243,12 +1245,28 @@
void AgendaEventView::handleEntryDeletion(ulong id)
{
OstTraceFunctionEntry0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_ENTRY );
-
- if (id == mAgendaEntry.id()) {
- // Close the agenda entry viewer
- close();
- mOwner->deletingCompleted();
- }
+ // Check if the entry which is viewed has been deleted or not
+ // The first check id == mAgendaEntry.id() will fail for the following case
+ // Exceptional entry is opened in the viewer. Edit this occurence in editor.
+ // From editor delete all occurences of the entry. In this case the viewer
+ // has the exceptional entry id which is not the same id which got deleted.
+ // Its the parent entry id. So checking if its a child and the entry deleted
+ // is the parent of this child.
+ if (id == mAgendaEntry.id() ||
+ (!mAgendaEntry.recurrenceId().isNull() && id == mParentId)) {
+ // If the editor is opened and the deletion is happening from editor
+ // then there is no need to emit the signal deletingCompleted() [as the
+ // deletingStarted() is not been emitted already]
+ // In this case closing of viewer will happen only once the editor
+ // is closed properly
+ mEntryIdDeleted = id;
+ if(!mCalenEditor) {
+ // If the editor is not opened then emit deletingCompleted()
+ // and close the viewer
+ mOwner->deletingCompleted();
+ close();
+ }
+ }
OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLEENTRYDELETION_EXIT );
}
@@ -1278,9 +1296,26 @@
// Cleanup.
mCalenEditorClosed = true;
- mCalenEditor->deleteLater();
mOwner->editingCompleted();
-
+ if(mCalenEditor) {
+ mCalenEditor->deleteLater();
+ // Check if the entry is deleted
+ if(mEntryIdDeleted) {
+ ulong currentId = mAgendaEntry.id();
+ // If the deleted entry is the same as current id then close viewer
+ // The second check is for exceptional entries which will be true,
+ // when all the occurences of the entry is deleted from the editor
+ // In this case the entry id deleted won't the same as current id
+ if(currentId == mEntryIdDeleted || mEntryIdDeleted == mParentId) {
+ // Close the viewer as the entry no longer exists
+ close();
+ }
+ // Reset the value.
+ mEntryIdDeleted = 0;
+ }
+ }
+
+
OstTraceFunctionExit0( AGENDAEVENTVIEW_HANDLECALENDAREDITORCLOSED_EXIT );
}
@@ -1362,10 +1397,10 @@
mProgressIconCount = mProgressIconCount % 10 + 1;
iconName.append(QVariant(mProgressIconCount).toString());
QStringList itemData;
+ itemData.append(QString::null);
+ itemData.append(QString::null);
itemData.append("qtg_small_location");
itemData.append(iconName);
- itemData.append(QString::null);
- mLocationWidget->setProperty(primaryLeftIconItem, true);
mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
mProgressTimer->start(100);
}
@@ -1378,7 +1413,7 @@
itemData.append(QString::null);
itemData.append(QString::null);
itemData.append("qtg_small_location");
- mLocationWidget->setProperty(primaryLeftIconItem, false);
+ itemData.append(QString::null);
mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
Qt::Orientations orientation=hbInstance->allMainWindows().first()->orientation();
mMaptilePath.clear();
@@ -1396,12 +1431,12 @@
}
else {
QStringList itemData;
+ itemData.append(QString::null);
+ itemData.append(QString::null);
itemData.append("qtg_small_location");
QString stopIcon;
stopIcon.append(QString("qtg_mono_search_stop"));
itemData.append(stopIcon);
- itemData.append(QString::null);
- mLocationWidget->setProperty(primaryLeftIconItem, true);
mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
}
@@ -1475,6 +1510,8 @@
getSubjectIcon(mAgendaEntry.type(),subjectIcon);
itemList.append(subjectIcon);
itemList.append(priorityIcon);
+ // This "DUMMY_ICON" is required only for the subject layout.
+ itemList.append(DUMMY_ICON);
itemList.append(QString::null);
mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
@@ -1501,6 +1538,7 @@
*/
void AgendaEventView::saveAndCloseEditor()
{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY );
if(mCalenEditorClosed){
QObject *plugin = qobject_cast<QObject*> (
mNotesEditorPluginLoader->instance());
@@ -1517,6 +1555,7 @@
mCalenEditor->saveAndCloseEditor();
}
}
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT );
}
/*!
@@ -1525,6 +1564,8 @@
*/
void AgendaEventView::closeAgendaEventView()
{
- close();
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY );
+ close();
+ OstTraceFunctionEntry0( AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT );
}
// End of file
--- a/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/src/agendaeventvieweritem.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -45,13 +45,15 @@
*/
AgendaEventViewerItem::AgendaEventViewerItem(QGraphicsItem *parent) :
HbWidget(parent), mPrimaryText(NULL), mSecondaryText(NULL),
- mPrimaryIcon(NULL), mSecondaryIcon(NULL),mPrimaryRightIcon(NULL),
- mPrimaryLeftIcon(NULL)
+ mPrimaryLeftIcon(NULL),mPrimaryRightIcon(NULL),
+ mSecondaryLeftIcon(NULL),mSecondaryRightIcon(NULL)
{
OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY );
// Path for widgetml and css files.
- HbStyleLoader::registerFilePath(":/");
+ HbStyleLoader::registerFilePath(":/agendaeventvieweritem.css");
+ HbStyleLoader::registerFilePath(":/agendaeventvieweritem.widgetml");
+ HbStyleLoader::registerFilePath(":/agendaeventvieweritem_color.css");
OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT );
}
@@ -62,7 +64,9 @@
AgendaEventViewerItem::~AgendaEventViewerItem()
{
OstTraceFunctionEntry0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_ENTRY );
- HbStyleLoader::unregisterFilePath(":/");
+ HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem.css");
+ HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem.widgetml");
+ HbStyleLoader::unregisterFilePath(":/agendaeventvieweritem_color.css");
OstTraceFunctionExit0( DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT );
}
@@ -79,101 +83,156 @@
{
OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY );
if (!itemData.isEmpty()) {
- QString firstItemData(QString::null);
- QString secondItemData(QString::null);
- QString thirdItemData(QString::null);
- if (itemData.count() == 2) {
- firstItemData = itemData.at(0);
- secondItemData = itemData.at(1);
- }
- else if (itemData.count() == 3) {
- firstItemData = itemData.at(0);
- secondItemData = itemData.at(1);
- thirdItemData = itemData.at(2);
- } else {
- firstItemData = itemData.at(0);
- }
if (role == Qt::DisplayRole) {
- if (!firstItemData.isEmpty()) {
+ for (int index=0; index < itemData.count(); index++)
+ setTextItemData(index, itemData.at(index));
+
+ } else {
+ if (role == Qt::DecorationRole) {
+ for (int index=0; index < itemData.count(); index++)
+ setIconItemData(index, itemData.at(index));
+
+ }
+ }
+ repolish();
+ OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT );
+ }
+}
+
+/*!
+ Sets the text data for EventViewer items
+
+ \param index item index
+ \param itenmData To set the given value to item
+ */
+void AgendaEventViewerItem::setTextItemData(int index, const QString &itemData)
+{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY );
+ switch(index) {
+ case 0: {
+ if (!itemData.isEmpty()) {
if (!mPrimaryText) {
mPrimaryText = new HbTextItem(this);
HbStyle::setItemName(mPrimaryText, "primaryTextItem");
mPrimaryText->setElideMode(Qt::ElideNone);
}
- mPrimaryText->setText(firstItemData);
+ mPrimaryText->setText(itemData);
} else {
if (mPrimaryText) {
delete mPrimaryText;
mPrimaryText = NULL;
}
}
-
+ break;
+ }
+ case 1: {
if (!mSecondaryText) {
mSecondaryText = new HbTextItem(this);
HbStyle::setItemName(mSecondaryText, "secondaryTextItem");
mSecondaryText->setTextWrapping(Hb::TextWordWrap);
}
-
- if (!secondItemData.isEmpty()) {
-
- mSecondaryText->setText(secondItemData);
+
+ if (!itemData.isEmpty()) {
+
+ mSecondaryText->setText(itemData);
} else {
mSecondaryText->setText("");
- }
- } else {
- if (role == Qt::DecorationRole) {
- if (!firstItemData.isEmpty()) {
- if (!mPrimaryLeftIcon) {
- mPrimaryLeftIcon = new HbIconItem(this);
- }
- HbStyle::setItemName(mPrimaryLeftIcon, "primaryLeftIconItem");
- mPrimaryLeftIcon->setVisible(true);
- mPrimaryLeftIcon->setIconName(firstItemData);
+ }
+ break;
+ }
+ }
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT );
+}
+
+/*!
+ Sets the icon data for EventViewer items
+
+ \param index item index
+ \param itenmData To set the given value to item
+ */
- } else {
- if (mPrimaryLeftIcon) {
- HbStyle::setItemName(mPrimaryLeftIcon,"");
- mPrimaryLeftIcon->setVisible(false);
- }
-
- }
- if (!secondItemData.isEmpty()) {
- if (!mPrimaryRightIcon) {
- mPrimaryRightIcon = new HbIconItem(this);
- }
- HbStyle::setItemName(mPrimaryRightIcon, "primaryRightIconItem");
- mPrimaryRightIcon->setVisible(true);
- mPrimaryRightIcon->setIconName(secondItemData);
+void AgendaEventViewerItem::setIconItemData(int index, const QString &itemData)
+{
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY );
+ switch (index) {
+ case 0: {
+ if (!itemData.isEmpty()) {
+ if (!mPrimaryLeftIcon) {
+ mPrimaryLeftIcon = new HbIconItem(this);
+ }
+ HbStyle::setItemName(mPrimaryLeftIcon, "primaryLeftIconItem");
+ mPrimaryLeftIcon->setIconName(itemData);
- } else {
- if (mPrimaryRightIcon) {
- HbStyle::setItemName(mPrimaryRightIcon,"");
- mPrimaryRightIcon->setVisible(false);
- }
-
- }
- if (!thirdItemData.isEmpty()) {
- if (!mSecondaryIcon) {
- mSecondaryIcon = new HbIconItem(this);
- HbStyle::setItemName(mSecondaryIcon,
- "secondaryIconItem");
- }
- mSecondaryIcon->setIconName(thirdItemData);
-
- } else {
- if (mSecondaryIcon) {
- delete mSecondaryIcon;
- mSecondaryIcon = NULL;
- }
-
+ } else {
+ if (mPrimaryLeftIcon) {
+ delete mPrimaryLeftIcon;
+ mPrimaryLeftIcon = NULL;
}
}
+ break;
}
+ case 1: {
+ if (!itemData.isEmpty()) {
+ if (!mPrimaryRightIcon) {
+ mPrimaryRightIcon = new HbIconItem(this);
+ }
+ HbStyle::setItemName(mPrimaryRightIcon, "primaryRightIconItem");
+ mPrimaryRightIcon->setVisible(true);
+ mPrimaryRightIcon->setIconName(itemData);
+
+ } else {
+ if (mPrimaryRightIcon) {
+ HbStyle::setItemName(mPrimaryRightIcon, "");
+ mPrimaryRightIcon->setVisible(false);
+ }
+
+ }
+ break;
+ }
+ case 2: {
+ if (!itemData.isEmpty()) {
+ if (!mSecondaryLeftIcon) {
+ mSecondaryLeftIcon = new HbIconItem(this);
+ HbStyle::setItemName(mSecondaryLeftIcon,
+ "secondaryLeftIconItem");
+ }
+ mSecondaryLeftIcon->setIconName(itemData);
+
+ } else {
+ if (mSecondaryLeftIcon) {
+ delete mSecondaryLeftIcon;
+ mSecondaryLeftIcon = NULL;
+ }
+
+ }
+ break;
+ }
+ case 3: {
+
+ if (!itemData.isEmpty()) {
+ if (!mSecondaryRightIcon) {
+ mSecondaryRightIcon = new HbIconItem(this);
+ HbStyle::setItemName(mSecondaryRightIcon,
+ "secondaryRightIconItem");
+ }
+ mSecondaryRightIcon->setIconName(itemData);
+
+ } else {
+ if (mSecondaryRightIcon) {
+ delete mSecondaryRightIcon;
+ mSecondaryRightIcon = NULL;
+ }
+
+ }
+ break;
+
+ }
+
}
- repolish();
- OstTraceFunctionExit0( AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT );
+ OstTraceFunctionEntry0( AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT );
}
// End of file --Don't remove this.
+
--- a/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/OstTraceDefinitions.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef __OSTTRACEDEFINITIONS_H__
#define __OSTTRACEDEFINITIONS_H__
// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,20 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __AGENDAEVENTVIEWTRACES_H__
@@ -88,6 +104,10 @@
#define AGENDAEVENTVIEW_UPDATEFIELDSFORTODOSTATUS_EXIT 0x8a007f
#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_ENTRY 0x8a0080
#define AGENDAEVENTVIEW_UPDATESUBJECTANDPRIORITYDATA_EXIT 0x8a0081
+#define AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY 0x8a0082
+#define AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT 0x8a0083
+#define AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY 0x8a0084
+#define AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT 0x8a0085
#endif
--- a/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewerTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,20 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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: Definition of AgendaEventViewer class
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __AGENDAEVENTVIEWERTRACES_H__
--- a/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewer_pTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,20 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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: Definition of AgendaEventViewerPrivate class
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __AGENDAEVENTVIEWER_PTRACES_H__
--- a/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/agendaeventviewerdocloaderTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,20 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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: Definition of the class AgendaEventViewerDocLoader
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __AGENDAEVENTVIEWERDOCLOADERTRACES_H__
--- a/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/agendaeventvieweritemTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,20 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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: Definition of AgendaEventViewerItem class
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __AGENDAEVENTVIEWERITEMTRACES_H__
@@ -12,6 +28,10 @@
#define DUP1_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT 0x8a007b
#define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY 0x8a007c
#define AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT 0x8a007d
+#define AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY 0x8a0086
+#define AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT 0x8a0087
+#define AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY 0x8a0088
+#define AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT 0x8a0089
#endif
--- a/calendarui/agendaeventviewer/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/agendaeventviewer/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+##
+# This is Default Licence added by TraceCompiler
+# 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:
+#
+##
#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
[GROUP]TRACE_FLOW=0x8a
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERDOCLOADER_CREATEOBJECT_ENTRY=0x75
@@ -6,6 +23,10 @@
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_AGENDAEVENTVIEWERITEM_EXIT=0x79
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_ENTRY=0x7c
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETEVENTVIEWERITEMDATA_EXIT=0x7d
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETICONITEMDATA_ENTRY=0x88
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETICONITEMDATA_EXIT=0x89
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_ENTRY=0x86
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERITEM_SETTEXTITEMDATA_EXIT=0x87
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_ENTRY=0x5d
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_AGENDAEVENTVIEWERPRIVATE_EXIT=0x5e
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEWERPRIVATE_DELETINGCOMPLETED_ENTRY=0x71
@@ -58,6 +79,8 @@
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_ALARMTIMETEXT_EXIT=0x24
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CHANGEDORIENTATION_ENTRY=0x4f
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CHANGEDORIENTATION_EXIT=0x50
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_ENTRY=0x84
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSEAGENDAEVENTVIEW_EXIT=0x85
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSE_ENTRY=0x3b
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_CLOSE_EXIT=0x3c
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_DELETEAGENDAENTRY_ENTRY=0x37
@@ -96,6 +119,8 @@
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_REPEATRULE_EXIT=0x22
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEAGENDAENTRY_ENTRY=0x39
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEAGENDAENTRY_EXIT=0x3a
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_ENTRY=0x82
+[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SAVEANDCLOSEEDITOR_EXIT=0x83
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_ENTRY=0x2f
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETECONFIRMATIONQUERY_EXIT=0x30
[TRACE]TRACE_FLOW[0x8A]_AGENDAEVENTVIEW_SHOWDELETEOCCURENCEPOPUP_ENTRY=0x2d
--- a/calendarui/application/application.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/application/application.pro Fri Sep 17 08:29:05 2010 +0300
@@ -38,6 +38,9 @@
"../conf/calendarUI_101F874B.crml APP_LAYER_CRML(calendarUI_101F874B.crml)" \
# stubsis is added to provide IAD
"../stubsis/calendar_stub.sis /epoc32/data/z/system/install/calendar_stub.sis" \
+ # splashml
+ "resources/calendar.docml /epoc32/data/z/resource/hb/splashml/calendar.docml" \
+ "resources/calendar.splashml /epoc32/data/z/resource/hb/splashml/calendar.splashml" \
# backup_registration.xml
"data/backup_registration.xml /epoc32/data/z/private/10005901/backup_registration.xml" \
"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005901/backup_registration.xml" \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/application/resources/calendar.docml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <widget name="view" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ </widget>
+ <widget name="viewMenu" role="HbView:menu" type="HbMenu">
+ </widget>
+ <string locid="txt_calendar_title_calendar" name="title" value="Calendar"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/application/resources/calendar.splashml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,6 @@
+<hbsplash version="1">
+ <docml>calendar.docml</docml>
+ <widget>view</widget>
+ <appuid>0x10005901</appuid>
+ <tsappname>Calendar</tsappname>
+</hbsplash>
--- a/calendarui/caleneditor/inc/caleneditor_p.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/inc/caleneditor_p.h Fri Sep 17 08:29:05 2010 +0300
@@ -168,8 +168,11 @@
const double geoLatitude, const double geoLongitude);
void handleDescriptionChange(const QString description);
void saveAndCloseEditor();
- void showDeleteConfirmationQuery(bool closeEditor = false);
+ void showDeletePopup();
+ void showDeleteConfirmationQuery();
+ void showDeleteOccurencePopup();
void handleDeleteAction();
+ void handleDeleteOccurence(int index);
void launchSettingsView();
void discardChanges();
void handleDescriptionAction();
--- a/calendarui/caleneditor/src/caleneditor_p.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditor_p.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -396,6 +396,9 @@
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY );
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the editor object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -578,10 +581,7 @@
headingWidget->setHeading(hbTrId("txt_calendar_subhead_meeting"));
}else if(CalenAgendaUtils::isAlldayEvent(*mEditedEntry)) {
headingWidget->setHeading(hbTrId("txt_calendar_subhead_all_day_event"));
- }else if (entryType == AgendaEntry::TypeTodo) {
- headingWidget->setHeading(hbTrId("txt_calendar_subhead_to_do"));
- }
-
+ }
}
initModel();
@@ -852,6 +852,7 @@
*/
QDateTime CalenEditorPrivate::defaultTimeSameDay( )
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY );
QDateTime currentDateTime = QDateTime::currentDateTime();
//Start time should be one hour more than current time.
@@ -883,10 +884,12 @@
// After adding one hour and rounding off the minutes to current time,
// if midnight crossover happens return default time(8:00 am) for next day
- if(CalenDateUtils::isOnToday(currentDateTime))
+ if(CalenDateUtils::isOnToday(currentDateTime)) {
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT );
return currentDateTime;
- else
+ } else {
return CalenDateUtils::defaultTime(currentDateTime);
+ }
}
/*!
@@ -894,6 +897,7 @@
*/
void CalenEditorPrivate::refreshTimeForUncheckAllDay()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY );
//Get the default time as 8:00 am from CalenDateUtils.
QDateTime fromDateTime = CalenDateUtils::defaultTime(mEditedEntry->startTime());
QDateTime toDateTime;
@@ -912,6 +916,7 @@
// Set the default start time to the event.
mEditedEntry->setStartAndEndTime(fromDateTime, toDateTime);
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT );
}
/*!
@@ -1330,10 +1335,12 @@
*/
void CalenEditorPrivate::handleSubjectChange(const QString subject)
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY );
mEditedEntry->setSummary(subject);
if(!mNewEntry ){
addDiscardAction();
}
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT );
}
/*!
@@ -1450,36 +1457,49 @@
void CalenEditorPrivate::handleLocationEditingFinished()
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY );
+ QString trimmedLocation ;
+ trimmedLocation = mEditedEntry->location().trimmed();
if ( !mOriginalEntry->location().isEmpty() )
{
- AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue();
- if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) )
- {
-
- mEditedEntry->setGeoValue(entryGeoValue);
- HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-
- confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
- confirmationQuery->setTimeout(HbDialog::NoTimeout);
- confirmationQuery->setIconVisible(true);
-
- QString displayText;
- displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing"));
-
- confirmationQuery->setText(displayText);
-
- // Remove the default actions.
- QList<QAction *> defaultActions = confirmationQuery->actions();
- for (int index=0;index<defaultActions.count();index++)
- {
- confirmationQuery->removeAction(defaultActions[index]);
- }
-
- defaultActions.clear();
- confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes")));
- confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no")));
- confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*)));
- }
+ if(!trimmedLocation .isEmpty())
+ {
+ AgendaGeoValue entryGeoValue =mAgendaUtil->fetchById(mEditedEntry->id()).geoValue();
+ if ( !entryGeoValue.isNull() && (mEditedEntry->location()!=mOriginalEntry->location()) )
+ {
+
+ mEditedEntry->setGeoValue(entryGeoValue);
+ HbMessageBox* confirmationQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+ // Set the parent for the dialog
+ // Once the editor object is deleted the dialog will also be deleted
+ confirmationQuery->setParent(this);
+ confirmationQuery->setDismissPolicy(HbDialog::NoDismiss);
+ confirmationQuery->setTimeout(HbDialog::NoTimeout);
+ confirmationQuery->setIconVisible(true);
+
+ QString displayText;
+ displayText = displayText.append(hbTrId("txt_calendar_info_location_updated_keep_existing"));
+
+ confirmationQuery->setText(displayText);
+
+ // Remove the default actions.
+ QList<QAction *> defaultActions = confirmationQuery->actions();
+ for (int index=0;index<defaultActions.count();index++)
+ {
+ confirmationQuery->removeAction(defaultActions[index]);
+ }
+
+ defaultActions.clear();
+ confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_yes")));
+ confirmationQuery->addAction(new HbAction(hbTrId("txt_common_button_no")));
+ confirmationQuery->open(this, SLOT(selectEditingFinishedAction(HbAction*)));
+ }
+ }
+ else
+ {
+ mEditedEntry->clearGeoValue();
+ // sets null string for the location
+ mEditedEntry->setLocation(trimmedLocation );
+ }
}
OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT );
}
@@ -1521,9 +1541,7 @@
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY );
Action action = handleDone();
- if (CalenEditorPrivate::ActionDelete != action) {
- closeEditor();
- }
+ closeEditor();
if (CalenEditorPrivate::ActionSave == action) {
// check if we need to launch the calendar application
@@ -1564,12 +1582,52 @@
return;
}else {
// Delete entry and close editor
- deleteEntry(true);
+ // if editor is launched from Notes then don't delete entry
+ // Just exit from calendar editor
+ if (mOriginalEntry->id() > 0) {
+ // If user is editing single instanc then delete single instance
+ // else delete entry
+ if (mEditRange == ThisOnly) {
+ // User wants to delete only this occurence
+ mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
+ AgendaUtil::ThisOnly);
+ } else {
+ // Delete the entry.
+ mAgendaUtil->deleteEntry(mOriginalEntry->id());
+ }
+ closeEditor();
+ }
}
OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT );
}
/*!
+ Deletes the entry based on the selection: This occurence or All occurences
+ */
+void CalenEditorPrivate::handleDeleteOccurence(int index)
+{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY );
+ switch (index) {
+ case 0:
+ // User wants to delete only this occurence
+ mAgendaUtil->deleteRepeatedEntry(mEntry, AgendaUtil::ThisOnly);
+ break;
+ case 1:
+ // User wants to delete all the occurences
+ // Delete the parent entry.
+ if(isChild()) {
+ AgendaEntry entryToBeDeleted = mAgendaUtil->parentEntry(mEntry);
+ mAgendaUtil->deleteEntry(entryToBeDeleted.id());
+ }else {
+ mAgendaUtil->deleteEntry(mOriginalEntry->id());
+ }
+ break;
+ }
+ closeEditor();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT );
+}
+
+/*!
Launches the Settings view.
*/
void CalenEditorPrivate::launchSettingsView()
@@ -1591,56 +1649,97 @@
}
/*!
- * Show delete confirmation query
+ * Show delete confirmation query based on the entry
*/
-void CalenEditorPrivate::showDeleteConfirmationQuery(bool closeEditor)
+void CalenEditorPrivate::showDeleteConfirmationQuery()
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY );
+ if(mOriginalEntry->isRepeating() || isChild()) {
+ showDeleteOccurencePopup();
+ }else {
+ showDeletePopup();
+ }
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT );
+}
+
+/*!
+ * Show delete confirmation query for repeated entries
+ */
+void CalenEditorPrivate::showDeleteOccurencePopup()
+{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY );
+ HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the editor object is deleted the dialog will also be deleted
+ popUp->setParent(this);
+ popUp->setDismissPolicy(HbDialog::NoDismiss);
+ popUp->setTimeout(HbDialog::NoTimeout);
+ popUp->setAttribute( Qt::WA_DeleteOnClose, true );
+
+ QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+ HbWidget *editWidget = new HbWidget();
+ editWidget->setLayout(layout);
+
+ HbRadioButtonList *editButtonList = new HbRadioButtonList();
+
+ QStringList list;
+ list << hbTrId("txt_calendar_info_this_occurrence_only")
+ << hbTrId("txt_calendar_info_all_occurences");
+
+ editButtonList->setItems(list);
+
+ layout->addItem(editButtonList);
+
+ popUp->setContentWidget(editWidget);
+ popUp->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_delete_repeated_entry")));
+
+ // Create cancel action
+ HbAction *cancelAction =
+ new HbAction(hbTrId("txt_common_button_cancel_singledialog"));
+ popUp->addAction(cancelAction);
+ connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
+ connect(editButtonList, SIGNAL(itemSelected(int)), this,
+ SLOT(handleDeleteOccurence(int)));
+ connect(cancelAction, SIGNAL(triggered()), this, SLOT(close()));
+
+ // Show the popup
+ popUp->open();
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT );
+}
+
+/*!
+ * Show delete confirmation query for non repeated entries
+ */
+void CalenEditorPrivate::showDeletePopup()
+{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY );
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+ // Set the parent for the dialog
+ // Once the editor object is deleted the dialog will also be deleted
+ popup->setParent(this);
popup->setDismissPolicy(HbDialog::NoDismiss);
popup->setTimeout(HbDialog::NoTimeout);
popup->setAttribute( Qt::WA_DeleteOnClose, true );
- QString text = 0;
+ popup->setText(hbTrId("txt_calendar_info_delete_entry"));
- switch (mOriginalEntry->type()) {
- case AgendaEntry::TypeAppoinment:
- case AgendaEntry::TypeEvent: {
- if (mEditRange == ThisAndAll) {
- text.append(hbTrId("txt_calendar_info_delete_entries"));
- } else {
- text.append(hbTrId("txt_calendar_info_delete_meeting"));
- }
- break;
- }
- case AgendaEntry::TypeAnniversary: {
- text.append(hbTrId("txt_calendar_info_delete_anniversary"));
- break;
- }
+ QList<QAction*> list = popup->actions();
+ for(int i=0; i < list.count(); i++)
+ {
+ popup->removeAction(list[i]);
}
-
- popup->setText(text);
-
- QList<QAction*> list = popup->actions();
- for(int i=0; i < list.count(); i++)
- {
- popup->removeAction(list[i]);
- }
HbAction *deleteAction = new HbAction(hbTrId("txt_common_button_delete"),
- popup);
+ popup);
popup->addAction(deleteAction);
connect(deleteAction, SIGNAL(triggered()), this,
- SLOT(handleDeleteAction()));
+ SLOT(handleDeleteAction()));
HbAction *cancelAction = new HbAction(hbTrId("txt_common_button_cancel"),
- popup);
- // Editor should not be closed for all the cases when cancel is pressed
- if(closeEditor) {
- connect(cancelAction, SIGNAL(triggered()), this,
- SLOT(closeEditor()));
- }
+ popup);
+ connect(cancelAction, SIGNAL(triggered()), this, SLOT(close()));
popup->addAction(cancelAction);
popup->open();
- OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT );
+
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT );
}
/*!
@@ -1650,7 +1749,7 @@
bool CalenEditorPrivate::isChild() const
{
OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISCHILD_ENTRY );
- return mEditedEntry->recurrenceId().toUTC().isNull();
+ return !(mEditedEntry->recurrenceId().toUTC().isNull());
}
/*!
@@ -1698,10 +1797,6 @@
}
OstTraceFunctionExit0( DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT );
return CalenEditorPrivate::ActionNothing;
- case CalenEditorPrivate::ActionDelete:
- showDeleteConfirmationQuery(true);
- OstTraceFunctionExit0( DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT );
- return CalenEditorPrivate::ActionDelete;
case CalenEditorPrivate::ActionNothing:
return CalenEditorPrivate::ActionNothing;
default:
@@ -1749,34 +1844,6 @@
}
/*!
- Delete the entry
- @param closeEditor set true to close editor else default value is false
- */
-void CalenEditorPrivate::deleteEntry(bool close)
-{
- OstTraceFunctionEntry0( CALENEDITORPRIVATE_DELETEENTRY_ENTRY );
- // if editor is launched from Notes then don't delete entry
- // Just exit from calendar editor
- if (mOriginalEntry->id() > 0) {
- // If user is editing single instanc then delete single instance
- // else delete entry
- if (mEditRange == ThisOnly) {
- // User wants to delete only this occurence
- mAgendaUtil->deleteRepeatedEntry(*mOriginalEntry,
- AgendaUtil::ThisOnly);
- } else {
- // Delete the entry.
- mAgendaUtil->deleteEntry(mOriginalEntry->id());
- }
-
- if (close) {
- closeEditor();
- }
- }
- OstTraceFunctionExit0( CALENEDITORPRIVATE_DELETEENTRY_EXIT );
-}
-
-/*!
Change the entry before saving, depending on AllDay checkbox state
*/
bool CalenEditorPrivate::handleAllDayToSave()
@@ -1948,11 +2015,13 @@
*/
bool CalenEditorPrivate::isRepeatUntilItemAdded()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY );
// For exceptional entries the repeatfield will not be present
// So need to check if the repeat field is there or not
if( mRepeatField ) {
return mRepeatField->isRepeatUntilItemAdded();
}else {
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT );
return false;
}
}
@@ -2005,6 +2074,7 @@
*/
int CalenEditorPrivate::getReminderCount()
{
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY );
return mReminderField->reminderItemsCount();
}
@@ -2033,6 +2103,17 @@
*/
void CalenEditorPrivate::forcedSaveEntry()
{
- saveAndCloseEditor();
+ OstTraceFunctionEntry0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY );
+ // Check if the editor is launched completely
+ // If yes, save entry and close the editor
+ if(mEditorView) {
+ saveAndCloseEditor();
+ }else {
+ // If the view is not launched then just emit signal dialogClosed()
+ // When the edit popup is shown for repeating entries,
+ // this else case will get executed
+ emit q_ptr->dialogClosed();
+ }
+ OstTraceFunctionExit0( CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT );
}
// End of file --Don't remove this.
--- a/calendarui/caleneditor/src/caleneditorcustomitem.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditorcustomitem.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -274,7 +274,7 @@
void CalenEditorCustomItem::launchLocationPicker()
{
- OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY );
+ OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_LAUNCHLOCATIONPICKER_ENTRY );
if(!mAppManager)
{
mAppManager = new XQApplicationManager();
@@ -418,6 +418,9 @@
OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLEDATE_ENTRY );
// Create a popup with datepicker for the user to select date.
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -455,6 +458,9 @@
OstTraceFunctionEntry0( CALENEDITORCUSTOMITEM_HANDLETIME_ENTRY );
// Create a popup with time picker for the user to select time.
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
--- a/calendarui/caleneditor/src/caleneditordatahandler.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditordatahandler.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -382,13 +382,6 @@
return CalenEditorPrivate::ActionSave;
}
}
- if (areTextItemsCleared() && !nonTextItemsEdited()) {
- // ***** edited entry + text items emptied + non-text items not edited
- // Even if user may have edited non-text fields,
- // delete the note
- OstTraceFunctionExit0( DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT );
- return CalenEditorPrivate::ActionDelete;
- }
// Save the note, since the text fields contain something
OstTraceFunctionExit0( DUP4_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT );
return CalenEditorPrivate::ActionSave;
--- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -143,6 +143,7 @@
*/
void CalenEditorReminderField::setSavedMeetingReminderIndex()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY );
// Get the reminder offset value.
int reminderOffset =
mCalenEditor->editedEntry()->alarm().timeOffset();
@@ -157,6 +158,7 @@
setCurrentIndex(ReminderAtStart);
else
setCurrentIndex(Reminder15MinsBefore);
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT );
}
/*!
@@ -411,6 +413,7 @@
*/
void CalenEditorReminderField::UpdateReminderChoicesForSameDay(QTime startTime)
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY );
QTime currentTime = QTime::currentTime();
int offset = currentTime.secsTo(startTime);
@@ -475,6 +478,7 @@
mEditorForm->addConnection(mReminderItem,
SIGNAL(currentIndexChanged(int)), this,
SLOT(handleReminderIndexChanged(int)));
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT );
}
/*!
@@ -637,6 +641,7 @@
*/
int CalenEditorReminderField::getReminderIndexBasedOnEntryAlarm()
{
+ OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY );
// Get the appropriate reminder index depending on the value of time offset.
AgendaAlarm actualAlarm = mCalenEditor->editedEntry()->alarm();
QTime referenceTime(0, 0, 0);
@@ -658,6 +663,7 @@
mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
* 60));
}
+ OstTraceFunctionExit0( CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT );
return index;
}
@@ -735,6 +741,9 @@
OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_LAUNCHREMINDERTIMEPICKER_ENTRY );
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
--- a/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/src/caleneditorrepeatfield.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -246,6 +246,7 @@
*/
void CalenEditorRepeatField::removeRepeatUntilItem()
{
+ OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY );
mRepeatRuleType = AgendaRepeatRule::InvalidRule;
if (mRepeatUntilItemAdded) {
mEditorForm->removeConnection(mCustomRepeatUntilItem, SIGNAL(clicked()),
@@ -258,6 +259,7 @@
mRepeatUntilItemAdded = false;
mCustomRepeatUntilItem = 0;
}
+ OstTraceFunctionExit0( CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT );
}
/*!
@@ -268,8 +270,6 @@
void CalenEditorRepeatField::handleRepeatIndexChanged(int index)
{
OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_HANDLEREPEATINDEXCHANGED_ENTRY );
- mIsBiWeekly = false;
- mIsWorkdays = false;
HbExtendedLocale locale = HbExtendedLocale::system();
// Get the user role we have set for this index
@@ -291,10 +291,16 @@
repeatPropertyChange = false;
}
QDate repeatUntilDate = mRepeatUntilDate;
+ int itemIndex = CalenEditorPrivate::RepeatUntilItem;
+ if (!mCalenEditor->isReminderTimeForAllDayAdded()) {
+ itemIndex -= 1;
+ }
// Update the repeat type only if its has been changed
// ie. if the previous repeatrole is different from the current repeat role
if (value != mRepeatRoleValue) {
mRepeatRoleValue = value;
+ mIsBiWeekly = false;
+ mIsWorkdays = false;
switch (value) {
case DailyRole: {
if (!mRepeatUntilItemAdded) {
@@ -401,16 +407,21 @@
// the reminder choices are updated
if(repeatPropertyChange || repeatUntilDate != mRepeatUntilDate) {
mCalenEditor->updateReminderChoices();
- // Once the entry is changed from non repeating to repeating
- // and if the alarm set is off
- // Then change the reminder option to the default 'one day before'
- // if the option is valid
- if (mCalenEditor->isAllDayEvent() &&
- repeatPropertyChange && mRepeatUntilItemAdded) {
- if(!mCalenEditor->isReminderTimeForAllDayAdded() &&
- mCalenEditor->getReminderCount() >= 3) {
- mCalenEditor->setCurrentIndexOfReminderField(
+
+ // Once the entry is changed from non repeating to repeating we scroll to the repeat until item.
+ if(repeatPropertyChange && mRepeatUntilItemAdded) {
+ mEditorForm->scrollTo(mCalenEditorModel->index(itemIndex, 0), HbAbstractItemView::EnsureVisible);
+
+ // Once the entry is changed from non repeating to repeating
+ // and if the alarm set is off
+ // Then change the reminder option to the default 'one day before'
+ // if the option is valid
+ if (mCalenEditor->isAllDayEvent()) {
+ if(!mCalenEditor->isReminderTimeForAllDayAdded() &&
+ mCalenEditor->getReminderCount() >= 3) {
+ mCalenEditor->setCurrentIndexOfReminderField(
CalenEditorReminderField::ReminderOneDayBefore);
+ }
}
}
}
@@ -458,8 +469,6 @@
r_qtn_date_usual_with_zero);
mCustomRepeatUntilItem->setContentWidgetData("text", dateString);
}
- //Scroll to repeat until item added
- mEditorForm->scrollTo(mCalenEditorModel->index(index, 0), HbAbstractItemView::EnsureVisible);
OstTraceFunctionExit0( CALENEDITORREPEATFIELD_INSERTREPEATUNTILITEM_EXIT );
}
@@ -481,6 +490,9 @@
{
OstTraceFunctionEntry0( CALENEDITORREPEATFIELD_LAUNCHREPEATUNTILDATEPICKER_ENTRY );
HbDialog *popUp = new HbDialog();
+ // Set the parent for the dialog
+ // Once the parent object is deleted the dialog will also be deleted
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setHeadingWidget( new HbLabel(
@@ -725,6 +737,11 @@
if (mRepeatRuleType != AgendaRepeatRule::InvalidRule) {
AgendaRepeatRule repeatRule(mRepeatRuleType);
+ //Set the week start day in the repeat rule.
+ HbExtendedLocale locale = HbExtendedLocale::system();
+ AgendaRepeatRule::Day wkStart = (AgendaRepeatRule::Day)locale.startOfWeek();
+ repeatRule.setWeekStart(wkStart);
+
//TODO : Set the repeat from and to dates
QVariant dateVariant =
mCustomRepeatUntilItem->contentWidgetData("text");
--- a/calendarui/caleneditor/traces/caleneditor_pTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/traces/caleneditor_pTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -107,14 +107,9 @@
#define CALENEDITORPRIVATE_HANDLEDONE_ENTRY 0x8a0075
#define CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0076
#define DUP1_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0077
-#define DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0078
#define DUP3_CALENEDITORPRIVATE_HANDLEDONE_EXIT 0x8a0079
#define CALENEDITORPRIVATE_SAVEENTRY_ENTRY 0x8a007a
-#define CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007b
-#define DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007c
#define DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT 0x8a007d
-#define CALENEDITORPRIVATE_DELETEENTRY_ENTRY 0x8a007e
-#define CALENEDITORPRIVATE_DELETEENTRY_EXIT 0x8a007f
#define CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY 0x8a0080
#define CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0081
#define DUP1_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a0082
@@ -140,14 +135,29 @@
#define CALENEDITORPRIVATE_CURRENTINDEXOFREMINDERFIELD_ENTRY 0x8a0096
#define CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_ENTRY 0x8a0097
#define CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_EXIT 0x8a0098
-#define CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY 0x8a0099
-#define CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT 0x8a009a
#define CALENEDITORPRIVATE_ISEDITRANGETHISONLY_ENTRY 0x8a009b
#define CALENEDITORPRIVATE_ISEDITRANGETHISONLY_EXIT 0x8a009c
#define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_ENTRY 0x8a009d
#define CALENEDITORPRIVATE_ISALLDAYFIELDADDED_EXIT 0x8a009e
#define DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014e
#define DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT 0x8a014f
+#define CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY 0x8a0150
+#define CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT 0x8a0151
+#define CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY 0x8a0152
+#define CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT 0x8a0153
+#define CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY 0x8a0154
+#define CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT 0x8a0155
+#define CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY 0x8a0156
+#define CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT 0x8a0157
+#define CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY 0x8a0158
+#define CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT 0x8a0159
+#define CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY 0x8a015a
+#define CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT 0x8a015b
+#define CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY 0x8a015c
+#define CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT 0x8a015d
+#define CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY 0x8a015e
+#define CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY 0x8a015f
+#define CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT 0x8a0160
#endif
--- a/calendarui/caleneditor/traces/caleneditordatahandlerTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/traces/caleneditordatahandlerTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -45,7 +45,6 @@
#define CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f4
#define DUP1_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f5
#define DUP2_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f6
-#define DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f7
#define DUP4_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT 0x8a00f8
#define CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_ENTRY 0x8a00f9
#define CALENEDITORDATAHANDLER_DURATIONGREATERTHANREPEATINTERVALERROR_EXIT 0x8a00fa
--- a/calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/traces/caleneditorreminderfieldTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -48,6 +48,12 @@
#define CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT 0x8a012f
#define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_ENTRY 0x8a0130
#define CALENEDITORREMINDERFIELD_ISREMINDERTIMEFORALLDAYADDED_EXIT 0x8a0131
+#define CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY 0x8a0161
+#define CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT 0x8a0162
+#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY 0x8a0163
+#define CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT 0x8a0164
+#define CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY 0x8a0165
+#define CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT 0x8a0166
#endif
--- a/calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/traces/caleneditorrepeatfieldTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -34,6 +34,8 @@
#define DUP1_CALENEDITORREPEATFIELD_UPDATEREPEATCHOICES_EXIT 0x8a014b
#define CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY 0x8a014c
#define CALENEDITORREPEATFIELD_SAVEREPEATRULE_EXIT 0x8a014d
+#define CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY 0x8a0167
+#define CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT 0x8a0168
#endif
--- a/calendarui/caleneditor/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/caleneditor/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -108,8 +108,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CREATE_ENTRY=0x1e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CREATE_EXIT=0x1f
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_CURRENTINDEXOFREMINDERFIELD_ENTRY=0x96
-[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_ENTRY=0x7e
-[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_EXIT=0x7f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_ENTRY=0x150
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DEFAULTTIMESAMEDAY_EXIT=0x151
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DISCARDCHANGES_ENTRY=0x70
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DISCARDCHANGES_EXIT=0x71
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDITEDENTRY_ENTRY=0x8a
@@ -118,6 +118,9 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_EDIT_EXIT=0x18
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_ENTRY=0x88
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ENABLEFROMTOTIMEFILEDS_EXIT=0x89
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_FORCEDSAVEENTRY_ENTRY=0x15f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_FORCEDSAVEENTRY_EXIT=0x160
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_GETREMINDERCOUNT_ENTRY=0x15e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_ENTRY=0x5b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYCHANGE_EXIT=0x5c
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_ENTRY=0x80
@@ -128,6 +131,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLECANCEL_EXIT=0x27
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEACTION_ENTRY=0x6b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEACTION_EXIT=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_ENTRY=0x156
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDELETEOCCURENCE_EXIT=0x157
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_ENTRY=0x41
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONACTION_EXIT=0x42
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLEDESCRIPTIONCHANGE_ENTRY=0x65
@@ -140,6 +145,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT=0x5e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_ENTRY=0x61
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLELOCATIONEDITINGFINISHED_EXIT=0x62
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_ENTRY=0x154
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_HANDLESUBJECTCHANGE_EXIT=0x155
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_INITMODEL_ENTRY=0x31
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_INITMODEL_EXIT=0x32
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISALLDAYEVENT_ENTRY=0x93
@@ -152,6 +159,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISNEWENTRY_ENTRY=0x8e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISNEWENTRY_EXIT=0x8f
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREMINDERTIMEFORALLDAYADDED_ENTRY=0x92
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_ENTRY=0x15c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_ISREPEATUNTILITEMADDED_EXIT=0x15d
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_ENTRY=0x6e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_LAUNCHSETTINGSVIEW_EXIT=0x6f
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_OPENEDITOR_ENTRY=0x28
@@ -172,12 +181,13 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATEREPEATITEM_EXIT=0x54
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATESUBJECTITEM_ENTRY=0x45
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_POPULATESUBJECTITEM_EXIT=0x46
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_ENTRY=0x152
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REFRESHTIMEFORUNCHECKALLDAY_EXIT=0x153
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_ENTRY=0x57
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_REMOVEDESCRIPTIONITEM_EXIT=0x58
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_ENTRY=0x67
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEANDCLOSEEDITOR_EXIT=0x68
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_ENTRY=0x7a
-[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEFROMDATETIME_ENTRY=0x4d
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEFROMDATETIME_EXIT=0x4e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVETODATETIME_ENTRY=0x51
@@ -186,12 +196,14 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SELECTEDITINGFINISHEDACTION_EXIT=0x64
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_ENTRY=0x97
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETCURRENTINDEXOFREMINDERFIELD_EXIT=0x98
-[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY=0x99
-[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT=0x9a
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETUPVIEW_ENTRY=0x2d
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETUPVIEW_EXIT=0x2e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_ENTRY=0x72
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETECONFIRMATIONQUERY_EXIT=0x73
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_ENTRY=0x158
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEOCCURENCEPOPUP_EXIT=0x159
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEPOPUP_ENTRY=0x15a
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWDELETEPOPUP_EXIT=0x15b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_ENTRY=0x22
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOCCURENCEPOPUP_EXIT=0x23
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SHOWEDITOR_ENTRY=0x2b
@@ -206,6 +218,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_CURRENTREMINDERINDEX_EXIT=0x12b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_ENTRY=0x12e
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_DISABLEREMINDERTIMEFIELD_EXIT=0x12f
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_ENTRY=0x165
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_GETREMINDERINDEXBASEDONENTRYALARM_EXIT=0x166
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_ENTRY=0x114
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_HANDLEREMINDERINDEXCHANGED_EXIT=0x115
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_INSERTREMINDERTIMEFIELD_ENTRY=0x11d
@@ -236,8 +250,12 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDEROFF_EXIT=0x118
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_ENTRY=0x125
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETREMINDERTIMEFORALLDAY_EXIT=0x126
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_ENTRY=0x161
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_SETSAVEDMEETINGREMINDERINDEX_EXIT=0x162
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_ENTRY=0x11b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORALLDAY_EXIT=0x11c
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_ENTRY=0x163
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREMINDERFIELD_UPDATEREMINDERCHOICESFORSAMEDAY_EXIT=0x164
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_ENTRY=0x136
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_ADDITEMTOMODEL_EXIT=0x137
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY=0x132
@@ -255,6 +273,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_POPULATEREPEATITEM_EXIT=0x13b
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_ENTRY=0x138
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEITEMFROMMODEL_EXIT=0x139
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_ENTRY=0x167
+[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REMOVEREPEATUNTILITEM_EXIT=0x168
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REPEATUNTILDATE_ENTRY=0x147
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_REPEATUNTILDATE_EXIT=0x148
[TRACE]TRACE_FLOW[0x8A]_CALENEDITORREPEATFIELD_SAVEREPEATRULE_ENTRY=0x14c
@@ -294,7 +314,6 @@
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_HANDLELOCATIONCHANGE_EXIT=0x60
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_ISALLDAYEVENT_EXIT=0x95
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_OPENEDITOR_EXIT=0x2a
-[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7c
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_ENTRY=0x10a
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREMINDERFIELD_CALENEDITORREMINDERFIELD_EXIT=0x10b
[TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORREPEATFIELD_CALENEDITORREPEATFIELD_ENTRY=0x134
@@ -313,7 +332,6 @@
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_EDIT_ENTRY=0x1b
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_EDIT_EXIT=0x1c
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x83
-[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x78
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7d
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_CALENEDITOR_ENTRY=0x5
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_CALENEDITOR_EXIT=0x6
@@ -322,7 +340,6 @@
[TRACE]TRACE_FLOW[0x8A]_DUP2_CALENEDITOR_EDIT_EXIT=0xb
[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORCUSTOMITEM_CREATECUSTOMWIDGET_EXIT=0xa8
[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_ISALLDAYEDITED_EXIT=0xe2
-[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf7
[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_EDIT_EXIT=0x1d
[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x84
[TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORPRIVATE_HANDLEDONE_EXIT=0x79
@@ -334,4 +351,11 @@
[TRACE]TRACE_FLOW[0x8A]_DUP5_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x86
[TRACE]TRACE_FLOW[0x8A]_DUP6_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x87
[TRACE]TRACE_FLOW[0x8A]_DUP7_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14e
-[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14f
\ No newline at end of file
+[TRACE]TRACE_FLOW[0x8A]_DUP8_CALENEDITORPRIVATE_HANDLEALLDAYTOSAVE_EXIT=0x14f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_ENTRY=0x7e
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_DELETEENTRY_EXIT=0x7f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7b
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_ENTRY=0x99
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENEDITORPRIVATE_SETREMINDERCHOICES_EXIT=0x9a
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CALENEDITORPRIVATE_SAVEENTRY_EXIT=0x7c
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CALENEDITORDATAHANDLER_SHOULDSAVEORDELETEORDONOTHING_EXIT=0xf7
--- a/calendarui/controller/inc/calendeleteui.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/inc/calendeleteui.h Fri Sep 17 08:29:05 2010 +0300
@@ -200,13 +200,16 @@
* called when a dialog is dismissed
*/
void DialogDismissedL( const int aButtonId );
-
+
+signals:
+ void closeDialogs();
+
public slots:
void doCompleted( int aFirstPassError );
void handleDateQuery(HbAction* action);
void handleDeletion(HbAction* action);
- void handleDeleteCancel();
+ void handleCancelAndClose(HbAction* action);
private slots:
void handleRepeatedEntryDelete(int index);
--- a/calendarui/controller/inc/calennotificationhandler.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/inc/calennotificationhandler.h Fri Sep 17 08:29:05 2010 +0300
@@ -39,6 +39,7 @@
ECalenNotifySettingsChanged,
ECalenNotifyViewCreationStarted,
ECalenNotifyDialogClosed,
+ ECalenNotifyCloseDialogs,
ECalenNotifyCommandFailed,
ECalenNotifyDeleteFailed,
ECalenNotifyEntryClosed,
--- a/calendarui/controller/src/calencontroller.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/src/calencontroller.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -638,6 +638,10 @@
{
OstTraceFunctionEntry0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY );
+ // Broadcast the notification ECalenNotifyCloseDialogs
+ // to close the opened dialogs if any
+ BroadcastNotification(ECalenNotifyCloseDialogs);
+
if (iIsFromServiceFrmWrk) {
// Set the context properly
mContext->setFocusDateAndTime(dateTime);
@@ -646,48 +650,57 @@
iIsFromServiceFrmWrk = false;
- } else { // Calendar was in backgroung but now its being brought to foreground
+ } else {
+ // Calendar was in backgroung but now its being brought to foreground
+
+ // Remove the previous view to avoid flicker
+ iViewManager->removePreviousView();
+
// If current state is editing state or printing state
// or deleting state or sending state, then dont do anything as
// user might loose the data
- CCalenStateMachine::TCalenStateIndex currentState = iStateMachine->CurrentState();
+
+ CCalenStateMachine::TCalenStateIndex currentState =
+ iStateMachine->CurrentState();
+
if ((currentState == CCalenStateMachine::ECalenDeletingState) ||
(currentState == CCalenStateMachine::ECalenPrintingState) ||
(currentState == CCalenStateMachine::ECalenSendingState)) {
// simply return - we dont have anything to do
- }
-
- else if (currentState == CCalenStateMachine::ECalenViewingState) {
- if(iViewManager->isEventViewerActive()){
- iViewManager->closeAgendaEventView();
- }
+ } else if (currentState == CCalenStateMachine::ECalenViewingState) {
+ if(iViewManager->isEventViewerActive()) {
+ iViewManager->closeAgendaEventView();
+ }
+ } else if (currentState == CCalenStateMachine::ECalenEditingState) {
+ // close the editor and save the entry if application is
+ // in background and launch the desired view
+ if(iViewManager->isEventViewerActive()) {
+ // First close editor and then viewer
+ iViewManager->saveAndCloseEditor();
+ iViewManager->closeAgendaEventView();
+ } else {
+ // If viewer is not active, just close the editor
+ iActionUi->saveAndCloseEditor();
+ }
+ } else if (currentState == CCalenStateMachine::ECalenSettingsState) {
+ iViewManager->removeSettingsView();
}
- else if (currentState == CCalenStateMachine::ECalenEditingState) {
- // close the editor and save the entry if application is in background
- //and launch the desired view
- if(iViewManager->isEventViewerActive()){
- iViewManager->saveAndCloseEditor();
- iViewManager->closeAgendaEventView();
- }
- else{
- iActionUi->saveAndCloseEditor();
- }
- }
-
- else if (currentState == CCalenStateMachine::ECalenSettingsState){
- iViewManager->removeSettingsView();
- }
// Set the context properly
mContext->setFocusDateAndTime(dateTime);
IssueCommandL(view);
-
+
// connect to raise the window to foreground once the view is ready
- connect(&MainWindow(), SIGNAL(viewReady()),
- this, SLOT(raiseWindow()));
+ connect(&MainWindow(), SIGNAL(viewReady()), this, SLOT(raiseWindow()));
+
+ // Dispatches all posted events of type DeferredDelete,
+ // i.e. empties the event queue in case any deletion is pending
+ qApp->sendPostedEvents(0, QEvent::DeferredDelete);
}
+ OstTraceFunctionExit0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT );
}
+
void CCalenController::raiseWindow()
{
MainWindow().raise();
--- a/calendarui/controller/src/calendeleteui.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/src/calendeleteui.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -104,7 +104,14 @@
{
OstTraceFunctionEntry0( CALENDELETEUI_CONSTRUCTL_ENTRY );
- iController.RegisterForNotificationsL( this, ECalenNotifyCancelDelete );
+ RArray<TCalenNotification> notifications;
+ notifications.Append(ECalenNotifyCancelDelete);
+ notifications.Append(ECalenNotifyCloseDialogs);
+
+ iController.RegisterForNotificationsL( this, notifications );
+
+ notifications.Close();
+
iMoreEntriesToDelete = EFalse;
iDisplayQuery = EFalse;
iEntriesToDelete = KEntriesToDelete;
@@ -133,6 +140,11 @@
}
}
+ else if (aNotification == ECalenNotifyCloseDialogs )
+ {
+ // Emit the signal to close all the dialogs which are already opened
+ emit closeDialogs();
+ }
OstTraceFunctionExit0( CALENDELETEUI_HANDLENOTIFICATION_EXIT );
}
@@ -385,6 +397,7 @@
// Create a popup with datepicker to select the date.
HbDialog *popUp = new HbDialog();
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout );
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -406,6 +419,8 @@
popUp->addAction(mDeleteAction);
mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"),popUp);
popUp->addAction(mCancelAction);
+ // Close the popup once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close()));
// Show the popup
popUp->open(this, SLOT(handleDateQuery(HbAction*)));
@@ -449,7 +464,7 @@
}
}else {
// User pressed cancel
- handleDeleteCancel();
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
}
// Reset the member variables
mDeleteAction = NULL;
@@ -468,6 +483,7 @@
OstTraceFunctionEntry0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY );
HbDialog *popUp = new HbDialog();
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -491,34 +507,39 @@
hbTrId("txt_calendar_title_delete_repeated_entry")));
// Add cancel action
- HbAction *cancelAction = new HbAction(
- hbTrId("txt_common_button_cancel_singledialog"));
- popUp->addAction(cancelAction);
+ mCancelAction = new HbAction(
+ hbTrId("txt_common_button_cancel_singledialog"));
+ popUp->addAction(mCancelAction);
connect(editButtonList, SIGNAL(itemSelected(int)), this,
SLOT(handleRepeatedEntryDelete(int)));
connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
- connect(cancelAction, SIGNAL(triggered()), this,
- SLOT(handleDeleteCancel()));
-
+ // Close the popup once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close()));
// Show the popup
- popUp->open();
+ popUp->open(this, SLOT(handleCancelAndClose(HbAction*)));
OstTraceFunctionExit0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT );
}
// ----------------------------------------------------------------------------
-// CalenDeleteUi::handleDeleteCancel
-// Handles the cancel action
+// CalenDeleteUi::handleCancelAndClose
+// Handles the cancel action and the close of the popup
// (other items were commented in a header).
// ----------------------------------------------------------------------------
//
-void CalenDeleteUi::handleDeleteCancel()
+void CalenDeleteUi::handleCancelAndClose(HbAction* action)
{
- OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETECANCEL_ENTRY );
-
- iController.BroadcastNotification(ECalenNotifyDeleteFailed);
-
- OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETECANCEL_EXIT );
+ OstTraceFunctionEntry0( CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY );
+ if(action == mCancelAction || !action) {
+ // If the user presses cancel button broadcast ECalenNotifyDeleteFailed
+ // Action will be null if the popup is closed by itself
+ // without pressing any buttons. So in this case also notification
+ // has to be broadcasted as ECalenNotifyDeleteFailed
+
+ iController.BroadcastNotification(ECalenNotifyDeleteFailed);
+ }
+ mCancelAction = NULL;
+ OstTraceFunctionExit0( CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT );
}
void CalenDeleteUi::handleRepeatedEntryDelete(int index)
@@ -565,6 +586,7 @@
OstTraceFunctionEntry0( CALENDELETEUI_SHOWDELETEQUERY_ENTRY );
HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+ popup->setParent(this);
popup->setDismissPolicy(HbDialog::NoDismiss);
popup->setTimeout(HbDialog::NoTimeout);
popup->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -615,6 +637,9 @@
popup->addAction(mDeleteAction);
mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"), popup);
popup->addAction(mCancelAction);
+ // Close the popup once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), popup, SLOT(close()));
+ // Show the popup
popup->open(this, SLOT(handleDeletion(HbAction*)));
OstTraceFunctionExit0( CALENDELETEUI_SHOWDELETEQUERY_EXIT );
@@ -683,9 +708,11 @@
break;
}
- } else {
- // If the user presses cancel button the notification will be
- // ECalenNotifyDeleteFailed as default.
+ } else if(!action || action == mCancelAction ) {
+ // Action will be null if the popup is closed by itself
+ // without pressing any buttons. So in this case also notification
+ // has to be broadcasted as ECalenNotifyDeleteFailed
+ // If the user presses cancel button also the same has to happen
// Notify the status
iController.BroadcastNotification(notification);
}
--- a/calendarui/controller/traces/calendeleteuiTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/traces/calendeleteuiTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -36,8 +36,6 @@
#define CALENDELETEUI_HANDLEDATEQUERY_EXIT 0x8a007c
#define CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY 0x8a007d
#define CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT 0x8a007e
-#define CALENDELETEUI_HANDLEDELETECANCEL_ENTRY 0x8a007f
-#define CALENDELETEUI_HANDLEDELETECANCEL_EXIT 0x8a0080
#define CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_ENTRY 0x8a0081
#define CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_EXIT 0x8a0082
#define CALENDELETEUI_SHOWDELETEQUERY_ENTRY 0x8a0083
@@ -69,6 +67,8 @@
#define CALENDELETEUI_DISPLAYWAITDIALOGL_EXIT 0x8a009d
#define CALENDELETEUI_MARKEDENTRIESDELETEDL_ENTRY 0x8a009e
#define CALENDELETEUI_MARKEDENTRIESDELETEDL_EXIT 0x8a009f
+#define CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY 0x8a01f9
+#define CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT 0x8a01fa
#endif
--- a/calendarui/controller/traces/calenviewmanagerTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/traces/calenviewmanagerTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -60,8 +60,6 @@
#define CALENVIEWMANAGER_HANDLEINSTANCEVIEWCREATION_EXIT 0x8a01f2
#define CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_ENTRY 0x8a01f3
#define CALENVIEWMANAGER_HANDLEENTRYVIEWCREATION_EXIT 0x8a01f4
-#define CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY 0x8a01f5
-#define CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT 0x8a01f6
#define CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_ENTRY 0x8a01f7
#define CALENVIEWMANAGER_LAUNCHSETTINGSVIEW_EXIT 0x8a01f8
--- a/calendarui/controller/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/controller/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -52,12 +52,12 @@
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_DODELETESINGLEINSTANCEL_EXIT=0x97
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_ENTRYDELETED_ENTRY=0x87
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_ENTRYDELETED_EXIT=0x88
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY=0x1f9
+[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT=0x1fa
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECOMMANDL_ENTRY=0x6b
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLECOMMANDL_EXIT=0x6c
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDATEQUERY_ENTRY=0x7b
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDATEQUERY_EXIT=0x7c
-[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_ENTRY=0x7f
-[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_EXIT=0x80
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_ENTRY=0x89
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETEMULTIPLEEVENTSL_EXIT=0x8a
[TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETION_ENTRY=0x85
@@ -148,8 +148,6 @@
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_GETFIRSTVIEW_EXIT=0x1d0
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLECOMMANDL_ENTRY=0x1e1
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLECOMMANDL_EXIT=0x1e2
-[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY=0x1f5
-[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT=0x1f6
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_ENTRY=0x1ef
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGCOMPLETED_EXIT=0x1f0
[TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDELETINGSTARTED_ENTRY=0x1ed
@@ -504,3 +502,8 @@
[TRACE]TRACE_FLOW[0x8A]_DUP9_CALENDOCLOADER_CREATEOBJECT_EXIT=0xba
[TRACE]TRACE_FLOW[0x8A]_TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_ENTRY=0x117
[TRACE]TRACE_FLOW[0x8A]_TNOTIFICATIONHANDLER_TNOTIFICATIONHANDLER_EXIT=0x118
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_ENTRY=0x7f
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENDELETEUI_HANDLEDELETECANCEL_EXIT=0x80
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_ENTRY=0x1f5
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CALENVIEWMANAGER_HANDLEDAYVIEWREADY_EXIT=0x1f6
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT=0x5c
--- a/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/regionalplugins/lunarchinese/inc/CalenLunarChinesePlugin.h Fri Sep 17 08:29:05 2010 +0300
@@ -42,6 +42,7 @@
class CCalenLunarLocalizer;
class CCalenLunarLocalizedInfo;
class CalenRegionalInfo;
+class HbMessageBox;
@@ -116,6 +117,8 @@
HbTranslator* iTranslator;
CalenRegionalInfo* iRegionalInfo ;
+
+ HbMessageBox* mPopup;
};
#endif //__CALENLUNARCHINESEPLUGIN_H__
--- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -130,7 +130,16 @@
void CCalenLunarChinesePlugin::ConstructL()
{
OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_CONSTRUCTL_ENTRY );
- iServices->RegisterForNotificationsL( this, ECalenNotifyContextChanged );
+
+ RArray<TCalenNotification> notifications;
+ notifications.Append(ECalenNotifyContextChanged);
+ notifications.Append(ECalenNotifyCloseDialogs);
+
+ iServices->RegisterForNotificationsL( this, notifications );
+
+ notifications.Close();
+
+
iServices->GetCommandRange( iStart, iEnd );
// Install the translator before the CCalenLunarLocalizer is constructed
@@ -299,10 +308,14 @@
const TCalenNotification aNotification )
{
OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_ENTRY );
- if (aNotification == ECalenNotifyContextChanged)
- {
- TRAP_IGNORE(UpdateLocalizerInfoL());
- }
+ if (aNotification == ECalenNotifyContextChanged) {
+ TRAP_IGNORE(UpdateLocalizerInfoL());
+ } else if(aNotification == ECalenNotifyCloseDialogs) {
+ if(mPopup){
+ //close the popup
+ mPopup->done(0);
+ }
+ }
OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_HANDLENOTIFICATION_EXIT );
}
@@ -359,30 +372,34 @@
//
void CCalenLunarChinesePlugin::ExecuteMessageDialogL(QString aMsgText)
{
- OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY );
- // Instantiate a popup
- HbMessageBox *popup = new HbMessageBox();
- popup->setDismissPolicy(HbDialog::NoDismiss);
- popup->setTimeout(HbDialog::NoTimeout);
- popup->setIconVisible(false);
- popup->setAttribute( Qt::WA_DeleteOnClose, true );
-
- popup->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_lunar_calendar")));
- popup->setText(aMsgText);
-
- // Remove the default actions
- QList<QAction*> list = popup->actions();
- for(int i=0; i < list.count(); i++)
- {
- popup->removeAction(list[i]);
- }
- // Sets the primary action
- popup->addAction(new HbAction(hbTrId("txt_common_button_close_singledialog"), popup));
+ OstTraceFunctionEntry0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_ENTRY );
+
+ // Instantiate a popup
+ mPopup = new HbMessageBox();
+ mPopup->setDismissPolicy(HbDialog::NoDismiss);
+ mPopup->setTimeout(HbDialog::NoTimeout);
+ mPopup->setIconVisible(false);
+ mPopup->setAttribute(Qt::WA_DeleteOnClose, true);
+
+ mPopup->setHeadingWidget(new HbLabel(hbTrId(
+ "txt_calendar_title_lunar_calendar")));
+ mPopup->setText(aMsgText);
- // Launch popup
- popup->open();
- OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT );
- }
+ // Remove the default actions
+ QList<QAction*> list = mPopup->actions();
+ for (int i = 0; i < list.count(); i++)
+ {
+ mPopup->removeAction(list[i]);
+ }
+ // Sets the primary action
+ mPopup->addAction(new HbAction(hbTrId(
+ "txt_common_button_close_singledialog"), mPopup));
+
+ // Launch popup
+ mPopup->open();
+
+ OstTraceFunctionExit0( CCALENLUNARCHINESEPLUGIN_EXECUTEMESSAGEDIALOGL_EXIT );
+ }
//EOF
--- a/calendarui/rom/Calendar.iby Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/rom/Calendar.iby Fri Sep 17 08:29:05 2010 +0300
@@ -36,6 +36,10 @@
// Stub sis
data=DATAZ_\system\install\calendar_stub.sis \System\Install\calendar_stub.sis
+data=ZRESOURCE\hb\splashml\calendar.splashml RESOURCE_FILES_DIR\hb\splashml\calendar.splashml
+data=ZRESOURCE\hb\splashml\calendar.docml RESOURCE_FILES_DIR\hb\splashml\calendar.docml
+
+
file=ABI_DIR\BUILD_DIR\calencommonutils.dll SHARED_LIB_DIR\calencommonutils.dll
file=ABI_DIR\BUILD_DIR\calenglobaldata.dll SHARED_LIB_DIR\calenglobaldata.dll
file=ABI_DIR\BUILD_DIR\calencustomisationmanager.dll SHARED_LIB_DIR\calencustomisationmanager.dll
--- a/calendarui/settings/src/calensettings.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/settings/src/calensettings.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -307,14 +307,9 @@
// Append Show Week Number settings item
mShowWeekNumberItem = new HbDataFormModelItem();
mShowWeekNumberItem->setType(HbDataFormModelItem::ToggleValueItem);
-
- QStringList values;
- values << hbTrId("txt_calendar_button_no")
- << hbTrId("txt_calendar_button_yes");
mShowWeekNumberItem->setData(HbDataFormModelItem::LabelRole,
QString(hbTrId("txt_calendar_setlabel_show_week_numbers")));
mShowWeekNumberItem->setContentWidgetData("objectName", "showWeekNumber");
-
mSettingsModel->appendDataFormItem(mShowWeekNumberItem);
mSettingsForm->addConnection(mShowWeekNumberItem, SIGNAL(clicked()),
this, SLOT(handleWeekNumberChange()));
@@ -344,7 +339,6 @@
//set the start day of the week to locale
locale.SetStartOfWeek(day);
locale.Set();
- updateShowWeekItem();
}
/*!
@@ -356,33 +350,38 @@
HbExtendedLocale locale = HbExtendedLocale::system();
mStartOfWeek = locale.startOfWeek();
mShowWeekStartOnInfoItem->setContentWidgetData("currentIndex", mStartOfWeek);
-
// Read the value form cenrep
QVariant value = mSettingsManager->readItemValue(*mWeekNumberCenrepKey);
uint showWeekNumber = value.toUInt();
//if start day is not Monday
- //set the show week number option dimmed ,
+ //removed the show week number option ,
//else set to proper status
- if(mStartOfWeek != HbExtendedLocale::Monday) {
- mShowWeekNumberItem->setContentWidgetData(QString("text"),
- QString(hbTrId("txt_calendar_button_no")));
- mShowWeekNumberItem->setContentWidgetData(QString("additionalText"),
- QString(hbTrId("txt_calendar_button_yes")));
- mShowWeekNumberItem->setEnabled(false);
+ if (mStartOfWeek != HbExtendedLocale::Monday) {
+ if (mWeekNumberItemAdded) {
+ mSettingsForm->removeConnection(mShowWeekNumberItem, SIGNAL(clicked()),
+ this, SLOT(handleWeekNumberChange()));
+ mSettingsModel->removeItem(mShowWeekNumberItem);
+ mWeekNumberItemAdded = false;
+ }
} else {
- if(showWeekNumber) {
- mShowWeekNumberItem->setContentWidgetData(QString("text"),
- QString(hbTrId("txt_calendar_button_yes")));
- mShowWeekNumberItem->setContentWidgetData(QString("additionalText"),
- QString(hbTrId("txt_calendar_button_no")));
- } else {
- mShowWeekNumberItem->setContentWidgetData(QString("text"),
- QString(hbTrId("txt_calendar_button_no")));
- mShowWeekNumberItem->setContentWidgetData(QString("additionalText"),
- QString(hbTrId("txt_calendar_button_yes")));
- }
- mShowWeekNumberItem->setEnabled(true);
+ //if option "show week number is not present"
+ //add the option in view
+ if (!mWeekNumberItemAdded) {
+ addWeekNumberItem();
+ }
+ if (showWeekNumber) {
+ mShowWeekNumberItem->setContentWidgetData(QString("text"),
+ QString(hbTrId("txt_calendar_button_yes")));
+ mShowWeekNumberItem->setContentWidgetData(QString("additionalText"),
+ QString(hbTrId("txt_calendar_button_no")));
+ } else {
+ mShowWeekNumberItem->setContentWidgetData(QString("text"),
+ QString(hbTrId("txt_calendar_button_no")));
+ mShowWeekNumberItem->setContentWidgetData(QString("additionalText"),
+ QString(hbTrId("txt_calendar_button_yes")));
+ }
+
}
}
// End of file
--- a/calendarui/views/bwins/calenviewsu.def Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/bwins/calenviewsu.def Fri Sep 17 08:29:05 2010 +0300
@@ -8,203 +8,203 @@
?setFocusToProperDay@CalenMonthGrid@@AAEXXZ @ 7 NONAME ; void CalenMonthGrid::setFocusToProperDay(void)
??1CalenPreviewPane@@UAE@XZ @ 8 NONAME ; CalenPreviewPane::~CalenPreviewPane(void)
?mousePressEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 9 NONAME ; void CalenMonthGrid::mousePressEvent(class QGraphicsSceneMouseEvent *)
- ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 10 NONAME ; class QList<class CalenMonthData> & CalenMonthView::monthDataList(void)
- ?completePopulation@CalenMonthView@@AAEXXZ @ 11 NONAME ; void CalenMonthView::completePopulation(void)
- ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 12 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *)
- ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 13 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList<class CalenMonthData> &)
- ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 14 NONAME ; void CalenMonthView::handleChangeOrientation(void)
- ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 15 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject
- ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 16 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void)
- ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void)
- ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 18 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void)
- ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 19 NONAME ; void CalenMonthGrid::scrollingFinished(void)
- ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 20 NONAME ; void CalenMonthGrid::setCurrentIdex(int)
- ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 21 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *)
- ??_ECalenMonthGrid@@UAE@I@Z @ 22 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int)
- ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *)
- ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 24 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *)
- ?populatePrevMonth@CalenMonthView@@QAEXXZ @ 25 NONAME ; void CalenMonthView::populatePrevMonth(void)
- ?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 26 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??1CalenPluginLabel@@UAE@XZ @ 27 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
- ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 28 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
- ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
- ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
- ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 31 NONAME ; void * CalenMonthView::qt_metacast(char const *)
- ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 32 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
- ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 33 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
- ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
- ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 35 NONAME ; void CalenPreviewPane::startAutoScroll(void)
- ?doLazyLoading@CalenMonthView@@QAEXXZ @ 36 NONAME ; void CalenMonthView::doLazyLoading(void)
- ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 37 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
- ??1CalenSettingsView@@UAE@XZ @ 38 NONAME ; CalenSettingsView::~CalenSettingsView(void)
- ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 39 NONAME ; class QDateTime CalenPreviewPane::Date(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
- ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 41 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
- ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 42 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
- ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 43 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
- ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 44 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
- ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
- ?clearListModel@CalenAgendaView@@QAEXXZ @ 46 NONAME ; void CalenAgendaView::clearListModel(void)
- ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 47 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
- ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 48 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
- ?populateNextMonth@CalenMonthView@@QAEXXZ @ 49 NONAME ; void CalenMonthView::populateNextMonth(void)
- ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 50 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
- ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 51 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
- ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 52 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
- ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 53 NONAME ; int CalenMonthView::rowsInFutMonth(void)
- ?launchDayView@CalenMonthView@@QAEXXZ @ 54 NONAME ; void CalenMonthView::launchDayView(void)
- ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 55 NONAME ; int CalenMonthView::getCurrGridIndex(void)
- ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 56 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
- ?prependRows@CalenMonthGrid@@QAEXXZ @ 57 NONAME ; void CalenMonthGrid::prependRows(void)
- ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 58 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
- ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 60 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
- ??1CalenThickLinesDrawer@@UAE@XZ @ 61 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
- ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 62 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
- ??_ECalenMonthView@@UAE@I@Z @ 63 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
- ??1CalenAgendaView@@UAE@XZ @ 64 NONAME ; CalenAgendaView::~CalenAgendaView(void)
- ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 65 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
- ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 66 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
- ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 67 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &)
- ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 68 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
- ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 69 NONAME ; void CalenPreviewPane::stopScrolling(void)
- ?refreshView@CalenSettingsView@@QAEXXZ @ 70 NONAME ; void CalenSettingsView::refreshView(void)
- ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 71 NONAME ; void CalenMonthView::addBackgroundFrame(void)
- ?createGrid@CalenMonthView@@AAEXXZ @ 72 NONAME ; void CalenMonthView::createGrid(void)
- ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 73 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
- ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 74 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
- ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 75 NONAME ; void CalenSettingsView::launchPreviousView(void)
- ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 76 NONAME ; void CalenMonthView::setCurrGridIndex(int)
- ?setDateToLabel@CalenMonthView@@AAEXXZ @ 77 NONAME ; void CalenMonthView::setDateToLabel(void)
- ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 78 NONAME ; void CalenMonthView::addWeekNumbers(void)
- ?downGesture@CalenMonthGrid@@AAEXXZ @ 79 NONAME ; void CalenMonthGrid::downGesture(void)
- ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 80 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 81 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
- ?upGesture@CalenMonthGrid@@AAEXXZ @ 82 NONAME ; void CalenMonthGrid::upGesture(void)
- ??1CalenMonthView@@UAE@XZ @ 83 NONAME ; CalenMonthView::~CalenMonthView(void)
- ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 84 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
- ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 85 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
- ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 86 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
- ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 87 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?initializeForm@CalenSettingsView@@QAEXXZ @ 88 NONAME ; void CalenSettingsView::initializeForm(void)
- ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 89 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
- ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 90 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
- ?goToToday@CalenMonthView@@AAEXXZ @ 91 NONAME ; void CalenMonthView::goToToday(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
- ?onContextChanged@CalenMonthView@@EAEXXZ @ 93 NONAME ; void CalenMonthView::onContextChanged(void)
- ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 94 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
- ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 95 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 96 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
- ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 97 NONAME ; void CalenMonthView::removeWeekNumbers(void)
- ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 98 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
- ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 99 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
- ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
- ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 101 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
- ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 102 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
- ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 103 NONAME ; void CalenMonthView::onLocaleChanged(int)
- ?doPopulation@CalenMonthView@@UAEXXZ @ 104 NONAME ; void CalenMonthView::doPopulation(void)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 105 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
- ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 106 NONAME ; void CalenNativeView::captureScreenshot(bool)
- ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 107 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
- ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 108 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
- ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 109 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
- ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 110 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
- ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 111 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
- ?appendRows@CalenMonthGrid@@QAEXXZ @ 112 NONAME ; void CalenMonthGrid::appendRows(void)
- ?HandleNotification@CalenAgendaView@@UAEXW4TCalenNotification@@@Z @ 113 NONAME ; void CalenAgendaView::HandleNotification(enum TCalenNotification)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 114 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
- ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 115 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
- ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 116 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
- ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 117 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
- ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 118 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
- ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 119 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
- ?doPopulation@CalenAgendaView@@UAEXXZ @ 120 NONAME ; void CalenAgendaView::doPopulation(void)
- ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 121 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
- ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 122 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
- ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
- ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 124 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
- ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 125 NONAME ; void CalenMonthView::populateWithInstanceView(void)
- ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
- ??1CalenAgendaViewWidget@@UAE@XZ @ 127 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void)
- ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 128 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
- ?doPopulation@CalenDayView@@UAEXXZ @ 129 NONAME ; void CalenDayView::doPopulation(void)
- ??1CalenDayView@@UAE@XZ @ 130 NONAME ; CalenDayView::~CalenDayView(void)
- ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 131 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
- ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 132 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
- ??1CalenMonthGrid@@UAE@XZ @ 133 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
- ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 134 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
- ?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 135 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
- ?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 136 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
- ?prepareForPopulation@CalenMonthView@@AAEXXZ @ 137 NONAME ; void CalenMonthView::prepareForPopulation(void)
- ?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 138 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
- ?updateDayLabel@CalenMonthView@@AAEXXZ @ 139 NONAME ; void CalenMonthView::updateDayLabel(void)
- ?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 140 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
- ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 141 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
- ?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 142 NONAME ; void CalenMonthView::setContextForActiveDay(int)
- ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 143 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
- ??_ECalenSettingsView@@UAE@I@Z @ 144 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
- ??_ECalenThickLinesDrawer@@UAE@I@Z @ 145 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
- ?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 146 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
- ?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
- ?changeOrientation@CalenMonthView@@EAEXW4Orientation@Qt@@@Z @ 148 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
- ?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 149 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
- ?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
- ?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 151 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
- ?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 152 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?disconnectAboutToQuitEvent@CalenAgendaView@@QAEXXZ @ 153 NONAME ; void CalenAgendaView::disconnectAboutToQuitEvent(void)
- ?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 154 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
- ?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 155 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
- ?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 156 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?createEditor@CalenMonthView@@AAEXXZ @ 157 NONAME ; void CalenMonthView::createEditor(void)
- ??_ECalenPreviewPane@@UAE@I@Z @ 158 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
- ?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 159 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
- ?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 160 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
- ?scrollVertically@CalenDayHourScrollArea@@QAEXABVQPointF@@@Z @ 161 NONAME ; void CalenDayHourScrollArea::scrollVertically(class QPointF const &)
- ??_ECalenDayHourScrollArea@@UAE@I@Z @ 162 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(unsigned int)
- ??0CalenDayHourScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 163 NONAME ; CalenDayHourScrollArea::CalenDayHourScrollArea(class QGraphicsItem *)
- ??1CalenDayHourScrollArea@@UAE@XZ @ 164 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(void)
- ?qt_metacall@CalenDayContentScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 165 NONAME ; int CalenDayContentScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 166 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *)
- ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 167 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *, int)
- ?gestureEvent@CalenDayContentScrollArea@@MAEXPAVQGestureEvent@@@Z @ 168 NONAME ; void CalenDayContentScrollArea::gestureEvent(class QGestureEvent *)
- ??_ECalenDayContentScrollArea@@UAE@I@Z @ 169 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(unsigned int)
- ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 170 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *)
- ?staticMetaObject@CalenDayContentScrollArea@@2UQMetaObject@@B @ 171 NONAME ; struct QMetaObject const CalenDayContentScrollArea::staticMetaObject
- ?checkPanDirection@CalenDayContentScrollArea@@AAEXPAVQPanGesture@@@Z @ 172 NONAME ; void CalenDayContentScrollArea::checkPanDirection(class QPanGesture *)
- ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 173 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *)
- ??0CalenDayContentScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 174 NONAME ; CalenDayContentScrollArea::CalenDayContentScrollArea(class QGraphicsItem *)
- ?event@CalenDayContentScrollArea@@MAE_NPAVQEvent@@@Z @ 175 NONAME ; bool CalenDayContentScrollArea::event(class QEvent *)
- ?qt_metacast@CalenDayContentScrollArea@@UAEPAXPBD@Z @ 176 NONAME ; void * CalenDayContentScrollArea::qt_metacast(char const *)
- ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 177 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *)
- ?scrollToMiddleWidget@CalenDayContentScrollArea@@QAEXXZ @ 178 NONAME ; void CalenDayContentScrollArea::scrollToMiddleWidget(void)
- ?eventFilter@CalenDayContentScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 179 NONAME ; bool CalenDayContentScrollArea::eventFilter(class QObject *, class QEvent *)
- ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 180 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *, int)
- ?staticMetaObject@CalenDayHourScrollArea@@2UQMetaObject@@B @ 181 NONAME ; struct QMetaObject const CalenDayHourScrollArea::staticMetaObject
- ?getStaticMetaObject@CalenDayHourScrollArea@@SAABUQMetaObject@@XZ @ 182 NONAME ; struct QMetaObject const & CalenDayHourScrollArea::getStaticMetaObject(void)
- ?setDateTime@CalenDayHourScrollArea@@QAEXABVQDateTime@@@Z @ 183 NONAME ; void CalenDayHourScrollArea::setDateTime(class QDateTime const &)
- ?scrollAreaMoveFinished@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 184 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveFinished(enum CalenScrollDirection)
- ?moveTo@CalenDayContentScrollArea@@AAEXABVQPointF@@H@Z @ 185 NONAME ; void CalenDayContentScrollArea::moveTo(class QPointF const &, int)
- ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 186 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *, int)
- ?scrollAreaMoveStarted@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 187 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveStarted(enum CalenScrollDirection)
- ?metaObject@CalenDayContentScrollArea@@UBEPBUQMetaObject@@XZ @ 188 NONAME ; struct QMetaObject const * CalenDayContentScrollArea::metaObject(void) const
- ?checkStartTimeOfEvent@CalenPreviewPane@@AAEXAAVQDateTime@@@Z @ 189 NONAME ; void CalenPreviewPane::checkStartTimeOfEvent(class QDateTime &)
- ?orientationChanged@CalenDayContentScrollArea@@AAEXW4Orientation@Qt@@@Z @ 190 NONAME ; void CalenDayContentScrollArea::orientationChanged(enum Qt::Orientation)
- ?qt_metacast@CalenDayHourScrollArea@@UAEPAXPBD@Z @ 191 NONAME ; void * CalenDayHourScrollArea::qt_metacast(char const *)
- ?getStaticMetaObject@CalenDayContentScrollArea@@SAABUQMetaObject@@XZ @ 192 NONAME ; struct QMetaObject const & CalenDayContentScrollArea::getStaticMetaObject(void)
- ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 193 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *, int)
- ?metaObject@CalenDayHourScrollArea@@UBEPBUQMetaObject@@XZ @ 194 NONAME ; struct QMetaObject const * CalenDayHourScrollArea::metaObject(void) const
- ?scrollByAmount@CalenDayContentScrollArea@@MAE_NABVQPointF@@@Z @ 195 NONAME ; bool CalenDayContentScrollArea::scrollByAmount(class QPointF const &)
- ?dateTime@CalenDayHourScrollArea@@QBE?AVQDateTime@@XZ @ 196 NONAME ; class QDateTime CalenDayHourScrollArea::dateTime(void) const
- ?qt_metacall@CalenDayHourScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 197 NONAME ; int CalenDayHourScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?moveFinished@CalenDayContentScrollArea@@AAEXXZ @ 198 NONAME ; void CalenDayContentScrollArea::moveFinished(void)
- ?scrollToHour@CalenDayHourScrollArea@@QAEXH@Z @ 199 NONAME ; void CalenDayHourScrollArea::scrollToHour(int)
- ??1CalenDayContentScrollArea@@UAE@XZ @ 200 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(void)
- ?handleThemeChange@CalenMonthGrid@@AAEXXZ @ 201 NONAME ; void CalenMonthGrid::handleThemeChange(void)
- ?effectStarted@CalenPreviewPane@@QAEXXZ @ 202 NONAME ; void CalenPreviewPane::effectStarted(void)
- ?handleThemeChange@CalenThickLinesDrawer@@AAEXXZ @ 203 NONAME ; void CalenThickLinesDrawer::handleThemeChange(void)
- ?effectFinished@CalenPreviewPane@@QAEXXZ @ 204 NONAME ; void CalenPreviewPane::effectFinished(void)
- ?handleThemeChange@CalenMonthView@@AAEXXZ @ 205 NONAME ; void CalenMonthView::handleThemeChange(void)
- ?isHorizontalSwipe@CalenDayContentScrollArea@@ABE_NM@Z @ 206 NONAME ; bool CalenDayContentScrollArea::isHorizontalSwipe(float) const
- ?handleThemeChange@CalenPreviewPane@@QAEXXZ @ 207 NONAME ; void CalenPreviewPane::handleThemeChange(void)
- ?disconnectAboutToQuitEvent@CalenMonthView@@QAEXXZ @ 208 NONAME ; void CalenMonthView::disconnectAboutToQuitEvent(void)
+ ?scrollVertically@CalenDayHourScrollArea@@QAEXABVQPointF@@@Z @ 10 NONAME ; void CalenDayHourScrollArea::scrollVertically(class QPointF const &)
+ ?disconnectAboutToQuitEvent@CalenMonthView@@QAEXXZ @ 11 NONAME ; void CalenMonthView::disconnectAboutToQuitEvent(void)
+ ?monthDataList@CalenMonthView@@QAEAAV?$QList@VCalenMonthData@@@@XZ @ 12 NONAME ; class QList<class CalenMonthData> & CalenMonthView::monthDataList(void)
+ ?completePopulation@CalenMonthView@@AAEXXZ @ 13 NONAME ; void CalenMonthView::completePopulation(void)
+ ??0CalenAgendaViewWidget@@QAE@AAVMCalenServices@@PAVCalenDocLoader@@@Z @ 14 NONAME ; CalenAgendaViewWidget::CalenAgendaViewWidget(class MCalenServices &, class CalenDocLoader *)
+ ?handleAppendingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 15 NONAME ; void CalenMonthGrid::handleAppendingRows(class QList<class CalenMonthData> &)
+ ?handleChangeOrientation@CalenMonthView@@AAEXXZ @ 16 NONAME ; void CalenMonthView::handleChangeOrientation(void)
+ ?staticMetaObject@CalenSettingsView@@2UQMetaObject@@B @ 17 NONAME ; struct QMetaObject const CalenSettingsView::staticMetaObject
+ ?docLoader@CalenAgendaView@@QAEPAVCalenDocLoader@@XZ @ 18 NONAME ; class CalenDocLoader * CalenAgendaView::docLoader(void)
+ ?getStaticMetaObject@CalenSettingsView@@SAABUQMetaObject@@XZ @ 19 NONAME ; struct QMetaObject const & CalenSettingsView::getStaticMetaObject(void)
+ ?updateMonthDataArrayWithActiveDates@CalenMonthView@@AAEXXZ @ 20 NONAME ; void CalenMonthView::updateMonthDataArrayWithActiveDates(void)
+ ?scrollingFinished@CalenMonthGrid@@QAEXXZ @ 21 NONAME ; void CalenMonthGrid::scrollingFinished(void)
+ ??_ECalenDayHourScrollArea@@UAE@I@Z @ 22 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(unsigned int)
+ ??0CalenDayHourScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 23 NONAME ; CalenDayHourScrollArea::CalenDayHourScrollArea(class QGraphicsItem *)
+ ?setCurrentIdex@CalenMonthGrid@@QAEXH@Z @ 24 NONAME ; void CalenMonthGrid::setCurrentIdex(int)
+ ??1CalenDayHourScrollArea@@UAE@XZ @ 25 NONAME ; CalenDayHourScrollArea::~CalenDayHourScrollArea(void)
+ ?setupView@CalenAgendaView@@QAEXPAVCalenDocLoader@@@Z @ 26 NONAME ; void CalenAgendaView::setupView(class CalenDocLoader *)
+ ??_ECalenMonthGrid@@UAE@I@Z @ 27 NONAME ; CalenMonthGrid::~CalenMonthGrid(unsigned int)
+ ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 28 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *)
+ ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *)
+ ?qt_metacall@CalenDayContentScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int CalenDayContentScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?handleThemeChange@CalenMonthGrid@@AAEXXZ @ 31 NONAME ; void CalenMonthGrid::handleThemeChange(void)
+ ?populatePrevMonth@CalenMonthView@@QAEXXZ @ 32 NONAME ; void CalenMonthView::populatePrevMonth(void)
+ ?qt_metacall@CalenSettingsView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 33 NONAME ; int CalenSettingsView::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 34 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *)
+ ??1CalenPluginLabel@@UAE@XZ @ 35 NONAME ; CalenPluginLabel::~CalenPluginLabel(void)
+ ?handleLeftEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 36 NONAME ; void CalenMonthView::handleLeftEffectCompleted(struct HbEffect::EffectStatus const &)
+ ?trUtf8@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString CalenDayHourScrollArea::trUtf8(char const *, char const *, int)
+ ?getStaticMetaObject@CalenMonthGrid@@SAABUQMetaObject@@XZ @ 38 NONAME ; struct QMetaObject const & CalenMonthGrid::getStaticMetaObject(void)
+ ?gestureEvent@CalenDayContentScrollArea@@MAEXPAVQGestureEvent@@@Z @ 39 NONAME ; void CalenDayContentScrollArea::gestureEvent(class QGestureEvent *)
+ ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CalenMonthView@@UAEPAXPBD@Z @ 41 NONAME ; void * CalenMonthView::qt_metacast(char const *)
+ ?staticMetaObject@CalenMonthView@@2UQMetaObject@@B @ 42 NONAME ; struct QMetaObject const CalenMonthView::staticMetaObject
+ ?setupView@CalenMonthView@@QAEXPAVCalenDocLoader@@@Z @ 43 NONAME ; void CalenMonthView::setupView(class CalenDocLoader *)
+ ?metaObject@CalenMonthGrid@@UBEPBUQMetaObject@@XZ @ 44 NONAME ; struct QMetaObject const * CalenMonthGrid::metaObject(void) const
+ ??_ECalenDayContentScrollArea@@UAE@I@Z @ 45 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(unsigned int)
+ ?startAutoScroll@CalenPreviewPane@@QAEXXZ @ 46 NONAME ; void CalenPreviewPane::startAutoScroll(void)
+ ?doLazyLoading@CalenMonthView@@QAEXXZ @ 47 NONAME ; void CalenMonthView::doLazyLoading(void)
+ ?setView@CalenMonthGrid@@QAEXPAVCalenMonthView@@@Z @ 48 NONAME ; void CalenMonthGrid::setView(class CalenMonthView *)
+ ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0@Z @ 49 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *)
+ ?staticMetaObject@CalenDayContentScrollArea@@2UQMetaObject@@B @ 50 NONAME ; struct QMetaObject const CalenDayContentScrollArea::staticMetaObject
+ ??1CalenSettingsView@@UAE@XZ @ 51 NONAME ; CalenSettingsView::~CalenSettingsView(void)
+ ?tapTriggered@CalenPreviewPane@@AAEXXZ @ 52 NONAME ; void CalenPreviewPane::tapTriggered(void)
+ ?Date@CalenPreviewPane@@QAE?AVQDateTime@@XZ @ 53 NONAME ; class QDateTime CalenPreviewPane::Date(void)
+ ?tr@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 54 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *, int)
+ ?metaObject@CalenMonthView@@UBEPBUQMetaObject@@XZ @ 55 NONAME ; struct QMetaObject const * CalenMonthView::metaObject(void) const
+ ??0CalenPreviewPane@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 56 NONAME ; CalenPreviewPane::CalenPreviewPane(class MCalenServices &, class QGraphicsItem *)
+ ?rowsInPrevMonth@CalenMonthView@@QAEHXZ @ 57 NONAME ; int CalenMonthView::rowsInPrevMonth(void)
+ ?handlePrependingRows@CalenMonthGrid@@AAEXAAV?$QList@VCalenMonthData@@@@@Z @ 58 NONAME ; void CalenMonthGrid::handlePrependingRows(class QList<class CalenMonthData> &)
+ ?metaObject@CalenPreviewPane@@UBEPBUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const * CalenPreviewPane::metaObject(void) const
+ ?clearListModel@CalenAgendaView@@QAEXXZ @ 60 NONAME ; void CalenAgendaView::clearListModel(void)
+ ?gestureEvent@CalenMonthGrid@@MAEXPAVQGestureEvent@@@Z @ 61 NONAME ; void CalenMonthGrid::gestureEvent(class QGestureEvent *)
+ ??0CalenDayView@@QAE@AAVMCalenServices@@@Z @ 62 NONAME ; CalenDayView::CalenDayView(class MCalenServices &)
+ ?checkPanDirection@CalenDayContentScrollArea@@AAEXPAVQPanGesture@@@Z @ 63 NONAME ; void CalenDayContentScrollArea::checkPanDirection(class QPanGesture *)
+ ?populateNextMonth@CalenMonthView@@QAEXXZ @ 64 NONAME ; void CalenMonthView::populateNextMonth(void)
+ ?handleRightEffectCompleted@CalenMonthView@@AAEXABUEffectStatus@HbEffect@@@Z @ 65 NONAME ; void CalenMonthView::handleRightEffectCompleted(struct HbEffect::EffectStatus const &)
+ ?qt_metacast@CalenMonthGrid@@UAEPAXPBD@Z @ 66 NONAME ; void * CalenMonthGrid::qt_metacast(char const *)
+ ?firstDayOfGrid@CalenMonthView@@QAE?AVQDateTime@@XZ @ 67 NONAME ; class QDateTime CalenMonthView::firstDayOfGrid(void)
+ ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 68 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *)
+ ?isHorizontalSwipe@CalenDayContentScrollArea@@ABE_NM@Z @ 69 NONAME ; bool CalenDayContentScrollArea::isHorizontalSwipe(float) const
+ ?rowsInFutMonth@CalenMonthView@@QAEHXZ @ 70 NONAME ; int CalenMonthView::rowsInFutMonth(void)
+ ?launchDayView@CalenMonthView@@QAEXXZ @ 71 NONAME ; void CalenMonthView::launchDayView(void)
+ ?effectStarted@CalenPreviewPane@@QAEXXZ @ 72 NONAME ; void CalenPreviewPane::effectStarted(void)
+ ?getCurrGridIndex@CalenMonthView@@QAEHXZ @ 73 NONAME ; int CalenMonthView::getCurrGridIndex(void)
+ ?gestureEvent@CalenPreviewPane@@MAEXPAVQGestureEvent@@@Z @ 74 NONAME ; void CalenPreviewPane::gestureEvent(class QGestureEvent *)
+ ?prependRows@CalenMonthGrid@@QAEXXZ @ 75 NONAME ; void CalenMonthGrid::prependRows(void)
+ ?orientationChanged@CalenMonthGrid@@MAEXW4Orientation@Qt@@@Z @ 76 NONAME ; void CalenMonthGrid::orientationChanged(enum Qt::Orientation)
+ ?qt_metacall@CalenPreviewPane@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int CalenPreviewPane::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0CalenDayContentScrollArea@@QAE@PAVQGraphicsItem@@@Z @ 78 NONAME ; CalenDayContentScrollArea::CalenDayContentScrollArea(class QGraphicsItem *)
+ ?event@CalenDayContentScrollArea@@MAE_NPAVQEvent@@@Z @ 79 NONAME ; bool CalenDayContentScrollArea::event(class QEvent *)
+ ?trUtf8@CalenPreviewPane@@SA?AVQString@@PBD0H@Z @ 80 NONAME ; class QString CalenPreviewPane::trUtf8(char const *, char const *, int)
+ ??1CalenThickLinesDrawer@@UAE@XZ @ 81 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(void)
+ ?qt_metacast@CalenDayContentScrollArea@@UAEPAXPBD@Z @ 82 NONAME ; void * CalenDayContentScrollArea::qt_metacast(char const *)
+ ?setView@CalenPreviewPane@@QAEXPAVCalenMonthView@@@Z @ 83 NONAME ; void CalenPreviewPane::setView(class CalenMonthView *)
+ ??_ECalenMonthView@@UAE@I@Z @ 84 NONAME ; CalenMonthView::~CalenMonthView(unsigned int)
+ ??1CalenAgendaView@@UAE@XZ @ 85 NONAME ; CalenAgendaView::~CalenAgendaView(void)
+ ?handleThemeChange@CalenThickLinesDrawer@@AAEXXZ @ 86 NONAME ; void CalenThickLinesDrawer::handleThemeChange(void)
+ ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0@Z @ 87 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *)
+ ?populatePreviewPane@CalenMonthView@@QAEXAAVQDateTime@@@Z @ 88 NONAME ; void CalenMonthView::populatePreviewPane(class QDateTime &)
+ ??0CalenSettingsView@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 89 NONAME ; CalenSettingsView::CalenSettingsView(class MCalenServices &, class QGraphicsItem *)
+ ??0CalenAgendaView@@QAE@AAVMCalenServices@@@Z @ 90 NONAME ; CalenAgendaView::CalenAgendaView(class MCalenServices &)
+ ?updateModelWithPrevMonth@CalenMonthView@@QAEXXZ @ 91 NONAME ; void CalenMonthView::updateModelWithPrevMonth(void)
+ ?scrollToMiddleWidget@CalenDayContentScrollArea@@QAEXXZ @ 92 NONAME ; void CalenDayContentScrollArea::scrollToMiddleWidget(void)
+ ?eventFilter@CalenDayContentScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 93 NONAME ; bool CalenDayContentScrollArea::eventFilter(class QObject *, class QEvent *)
+ ?stopScrolling@CalenPreviewPane@@QAEXXZ @ 94 NONAME ; void CalenPreviewPane::stopScrolling(void)
+ ?tr@CalenDayHourScrollArea@@SA?AVQString@@PBD0H@Z @ 95 NONAME ; class QString CalenDayHourScrollArea::tr(char const *, char const *, int)
+ ?staticMetaObject@CalenDayHourScrollArea@@2UQMetaObject@@B @ 96 NONAME ; struct QMetaObject const CalenDayHourScrollArea::staticMetaObject
+ ?refreshView@CalenSettingsView@@QAEXXZ @ 97 NONAME ; void CalenSettingsView::refreshView(void)
+ ?getStaticMetaObject@CalenDayHourScrollArea@@SAABUQMetaObject@@XZ @ 98 NONAME ; struct QMetaObject const & CalenDayHourScrollArea::getStaticMetaObject(void)
+ ?addBackgroundFrame@CalenMonthView@@AAEXXZ @ 99 NONAME ; void CalenMonthView::addBackgroundFrame(void)
+ ?createGrid@CalenMonthView@@AAEXXZ @ 100 NONAME ; void CalenMonthView::createGrid(void)
+ ?tr@CalenPreviewPane@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString CalenPreviewPane::tr(char const *, char const *)
+ ?getStaticMetaObject@CalenPreviewPane@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & CalenPreviewPane::getStaticMetaObject(void)
+ ?setDateToLabel@CalenMonthView@@AAEXXZ @ 103 NONAME ; void CalenMonthView::setDateToLabel(void)
+ ?setCurrGridIndex@CalenMonthView@@QAEXH@Z @ 104 NONAME ; void CalenMonthView::setCurrGridIndex(int)
+ ?launchPreviousView@CalenSettingsView@@AAEXXZ @ 105 NONAME ; void CalenSettingsView::launchPreviousView(void)
+ ?addWeekNumbers@CalenMonthView@@AAEXXZ @ 106 NONAME ; void CalenMonthView::addWeekNumbers(void)
+ ?downGesture@CalenMonthGrid@@AAEXXZ @ 107 NONAME ; void CalenMonthGrid::downGesture(void)
+ ?setDateTime@CalenDayHourScrollArea@@QAEXABVQDateTime@@@Z @ 108 NONAME ; void CalenDayHourScrollArea::setDateTime(class QDateTime const &)
+ ?qt_metacall@CalenThickLinesDrawer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 109 NONAME ; int CalenThickLinesDrawer::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?setupView@CalenDayView@@QAEXPAVCalenDocLoader@@@Z @ 110 NONAME ; void CalenDayView::setupView(class CalenDocLoader *)
+ ?handleThemeChange@CalenPreviewPane@@QAEXXZ @ 111 NONAME ; void CalenPreviewPane::handleThemeChange(void)
+ ?upGesture@CalenMonthGrid@@AAEXXZ @ 112 NONAME ; void CalenMonthGrid::upGesture(void)
+ ??1CalenMonthView@@UAE@XZ @ 113 NONAME ; CalenMonthView::~CalenMonthView(void)
+ ?scrollAreaMoveFinished@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 114 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveFinished(enum CalenScrollDirection)
+ ?moveTo@CalenDayContentScrollArea@@AAEXABVQPointF@@H@Z @ 115 NONAME ; void CalenDayContentScrollArea::moveTo(class QPointF const &, int)
+ ?staticMetaObject@CalenMonthGrid@@2UQMetaObject@@B @ 116 NONAME ; struct QMetaObject const CalenMonthGrid::staticMetaObject
+ ?dateFromContext@CalenMonthView@@AAE?AVQDateTime@@ABVMCalenContext@@@Z @ 117 NONAME ; class QDateTime CalenMonthView::dateFromContext(class MCalenContext const &)
+ ?tr@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 118 NONAME ; class QString CalenDayContentScrollArea::tr(char const *, char const *, int)
+ ?scrollAreaMoveStarted@CalenDayContentScrollArea@@IAEXW4CalenScrollDirection@@@Z @ 119 NONAME ; void CalenDayContentScrollArea::scrollAreaMoveStarted(enum CalenScrollDirection)
+ ?trUtf8@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 120 NONAME ; class QString CalenMonthGrid::trUtf8(char const *, char const *, int)
+ ?paint@CalenThickLinesDrawer@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 121 NONAME ; void CalenThickLinesDrawer::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+ ?initializeForm@CalenSettingsView@@QAEXXZ @ 122 NONAME ; void CalenSettingsView::initializeForm(void)
+ ?effectFinished@CalenPreviewPane@@QAEXXZ @ 123 NONAME ; void CalenPreviewPane::effectFinished(void)
+ ?tr@CalenMonthGrid@@SA?AVQString@@PBD0H@Z @ 124 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *, int)
+ ?handlePanGestureFinished@CalenMonthGrid@@AAEXXZ @ 125 NONAME ; void CalenMonthGrid::handlePanGestureFinished(void)
+ ?metaObject@CalenDayContentScrollArea@@UBEPBUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const * CalenDayContentScrollArea::metaObject(void) const
+ ?goToToday@CalenMonthView@@AAEXXZ @ 127 NONAME ; void CalenMonthView::goToToday(void)
+ ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 128 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *, int)
+ ?onContextChanged@CalenMonthView@@EAEXXZ @ 129 NONAME ; void CalenMonthView::onContextChanged(void)
+ ?qt_metacast@CalenPreviewPane@@UAEPAXPBD@Z @ 130 NONAME ; void * CalenPreviewPane::qt_metacast(char const *)
+ ?getCurrentIndex@CalenMonthGrid@@QAEHXZ @ 131 NONAME ; int CalenMonthGrid::getCurrentIndex(void)
+ ?tr@CalenSettingsView@@SA?AVQString@@PBD0H@Z @ 132 NONAME ; class QString CalenSettingsView::tr(char const *, char const *, int)
+ ?removeWeekNumbers@CalenMonthView@@AAEXXZ @ 133 NONAME ; void CalenMonthView::removeWeekNumbers(void)
+ ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 134 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *, int)
+ ?setNoEntriesLabel@CalenPreviewPane@@QAEXPAVHbLabel@@@Z @ 135 NONAME ; void CalenPreviewPane::setNoEntriesLabel(class HbLabel *)
+ ??0CalenMonthView@@QAE@AAVMCalenServices@@@Z @ 136 NONAME ; CalenMonthView::CalenMonthView(class MCalenServices &)
+ ?getStaticMetaObject@CalenThickLinesDrawer@@SAABUQMetaObject@@XZ @ 137 NONAME ; struct QMetaObject const & CalenThickLinesDrawer::getStaticMetaObject(void)
+ ??0CalenThickLinesDrawer@@QAE@W4WidgetType@CalendarNamespace@@PAVQGraphicsItem@@@Z @ 138 NONAME ; CalenThickLinesDrawer::CalenThickLinesDrawer(enum CalendarNamespace::WidgetType, class QGraphicsItem *)
+ ?onLocaleChanged@CalenMonthView@@UAEXH@Z @ 139 NONAME ; void CalenMonthView::onLocaleChanged(int)
+ ?doPopulation@CalenMonthView@@UAEXXZ @ 140 NONAME ; void CalenMonthView::doPopulation(void)
+ ?tr@CalenMonthView@@SA?AVQString@@PBD0H@Z @ 141 NONAME ; class QString CalenMonthView::tr(char const *, char const *, int)
+ ?captureScreenshot@CalenNativeView@@QAEX_N@Z @ 142 NONAME ; void CalenNativeView::captureScreenshot(bool)
+ ?GetInstanceListL@CalenPreviewPane@@AAEXXZ @ 143 NONAME ; void CalenPreviewPane::GetInstanceListL(void)
+ ?getInstanceList@CalenMonthView@@AAEXAAV?$QList@VQDate@@@@VQDateTime@@1@Z @ 144 NONAME ; void CalenMonthView::getInstanceList(class QList<class QDate> &, class QDateTime, class QDateTime)
+ ?tr@CalenMonthView@@SA?AVQString@@PBD0@Z @ 145 NONAME ; class QString CalenMonthView::tr(char const *, char const *)
+ ?refreshViewOnGoToDate@CalenMonthView@@EAEXXZ @ 146 NONAME ; void CalenMonthView::refreshViewOnGoToDate(void)
+ ??0CalenMonthGrid@@QAE@PAVQGraphicsItem@@@Z @ 147 NONAME ; CalenMonthGrid::CalenMonthGrid(class QGraphicsItem *)
+ ?appendRows@CalenMonthGrid@@QAEXXZ @ 148 NONAME ; void CalenMonthGrid::appendRows(void)
+ ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0H@Z @ 149 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *, int)
+ ??0CalenPluginLabel@@QAE@AAVMCalenServices@@PAVQGraphicsItem@@@Z @ 150 NONAME ; CalenPluginLabel::CalenPluginLabel(class MCalenServices &, class QGraphicsItem *)
+ ?mouseReleaseEvent@CalenMonthGrid@@EAEXPAVQGraphicsSceneMouseEvent@@@Z @ 151 NONAME ; void CalenMonthGrid::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+ ?updateMonthGridWithInActiveMonths@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@@Z @ 152 NONAME ; void CalenMonthGrid::updateMonthGridWithInActiveMonths(class QList<class CalenMonthData> &)
+ ?staticMetaObject@CalenPreviewPane@@2UQMetaObject@@B @ 153 NONAME ; struct QMetaObject const CalenPreviewPane::staticMetaObject
+ ?getCurrentDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 154 NONAME ; class QDateTime CalenMonthView::getCurrentDay(void)
+ ?doPopulation@CalenAgendaView@@UAEXXZ @ 155 NONAME ; void CalenAgendaView::doPopulation(void)
+ ?tr@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 156 NONAME ; class QString CalenSettingsView::tr(char const *, char const *)
+ ?checkStartTimeOfEvent@CalenPreviewPane@@AAEXAAVQDateTime@@@Z @ 157 NONAME ; void CalenPreviewPane::checkStartTimeOfEvent(class QDateTime &)
+ ?onTwoSecondsTimeout@CalenPreviewPane@@QAEXXZ @ 158 NONAME ; void CalenPreviewPane::onTwoSecondsTimeout(void)
+ ?tr@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 159 NONAME ; class QString CalenThickLinesDrawer::tr(char const *, char const *)
+ ?staticMetaObject@CalenThickLinesDrawer@@2UQMetaObject@@B @ 160 NONAME ; struct QMetaObject const CalenThickLinesDrawer::staticMetaObject
+ ?populateWithInstanceView@CalenMonthView@@AAEXXZ @ 161 NONAME ; void CalenMonthView::populateWithInstanceView(void)
+ ?trUtf8@CalenThickLinesDrawer@@SA?AVQString@@PBD0@Z @ 162 NONAME ; class QString CalenThickLinesDrawer::trUtf8(char const *, char const *)
+ ??1CalenAgendaViewWidget@@UAE@XZ @ 163 NONAME ; CalenAgendaViewWidget::~CalenAgendaViewWidget(void)
+ ?orientationChanged@CalenDayContentScrollArea@@AAEXW4Orientation@Qt@@@Z @ 164 NONAME ; void CalenDayContentScrollArea::orientationChanged(enum Qt::Orientation)
+ ?populateLabel@CalenPreviewPane@@QAEXVQDateTime@@@Z @ 165 NONAME ; void CalenPreviewPane::populateLabel(class QDateTime)
+ ?qt_metacast@CalenDayHourScrollArea@@UAEPAXPBD@Z @ 166 NONAME ; void * CalenDayHourScrollArea::qt_metacast(char const *)
+ ?doPopulation@CalenDayView@@UAEXXZ @ 167 NONAME ; void CalenDayView::doPopulation(void)
+ ??1CalenDayView@@UAE@XZ @ 168 NONAME ; CalenDayView::~CalenDayView(void)
+ ?updateModelWithFutureMonth@CalenMonthView@@QAEXXZ @ 169 NONAME ; void CalenMonthView::updateModelWithFutureMonth(void)
+ ?getStaticMetaObject@CalenDayContentScrollArea@@SAABUQMetaObject@@XZ @ 170 NONAME ; struct QMetaObject const & CalenDayContentScrollArea::getStaticMetaObject(void)
+ ?updateMonthGridModel@CalenMonthGrid@@QAEXAAV?$QList@VCalenMonthData@@@@H_N@Z @ 171 NONAME ; void CalenMonthGrid::updateMonthGridModel(class QList<class CalenMonthData> &, int, bool)
+ ??1CalenMonthGrid@@UAE@XZ @ 172 NONAME ; CalenMonthGrid::~CalenMonthGrid(void)
+ ?metaObject@CalenThickLinesDrawer@@UBEPBUQMetaObject@@XZ @ 173 NONAME ; struct QMetaObject const * CalenThickLinesDrawer::metaObject(void) const
+ ?updateWeekNumGridModel@CalenMonthView@@AAEXXZ @ 174 NONAME ; void CalenMonthView::updateWeekNumGridModel(void)
+ ?trUtf8@CalenDayContentScrollArea@@SA?AVQString@@PBD0H@Z @ 175 NONAME ; class QString CalenDayContentScrollArea::trUtf8(char const *, char const *, int)
+ ?qt_metacast@CalenThickLinesDrawer@@UAEPAXPBD@Z @ 176 NONAME ; void * CalenThickLinesDrawer::qt_metacast(char const *)
+ ?metaObject@CalenDayHourScrollArea@@UBEPBUQMetaObject@@XZ @ 177 NONAME ; struct QMetaObject const * CalenDayHourScrollArea::metaObject(void) const
+ ?prepareForPopulation@CalenMonthView@@AAEXXZ @ 178 NONAME ; void CalenMonthView::prepareForPopulation(void)
+ ?scrollByAmount@CalenDayContentScrollArea@@MAE_NABVQPointF@@@Z @ 179 NONAME ; bool CalenDayContentScrollArea::scrollByAmount(class QPointF const &)
+ ?handleThemeChange@CalenMonthView@@AAEXXZ @ 180 NONAME ; void CalenMonthView::handleThemeChange(void)
+ ?handlePreviewPaneGesture@CalenMonthView@@QAEX_N@Z @ 181 NONAME ; void CalenMonthView::handlePreviewPaneGesture(bool)
+ ?updateDayLabel@CalenMonthView@@AAEXXZ @ 182 NONAME ; void CalenMonthView::updateDayLabel(void)
+ ?setActiveDates@CalenMonthGrid@@AAEXVQDate@@@Z @ 183 NONAME ; void CalenMonthGrid::setActiveDates(class QDate)
+ ?dateTime@CalenDayHourScrollArea@@QBE?AVQDateTime@@XZ @ 184 NONAME ; class QDateTime CalenDayHourScrollArea::dateTime(void) const
+ ?trUtf8@CalenMonthView@@SA?AVQString@@PBD0@Z @ 185 NONAME ; class QString CalenMonthView::trUtf8(char const *, char const *)
+ ?setContextForActiveDay@CalenMonthView@@QAEXH@Z @ 186 NONAME ; void CalenMonthView::setContextForActiveDay(int)
+ ?trUtf8@CalenSettingsView@@SA?AVQString@@PBD0@Z @ 187 NONAME ; class QString CalenSettingsView::trUtf8(char const *, char const *)
+ ??_ECalenSettingsView@@UAE@I@Z @ 188 NONAME ; CalenSettingsView::~CalenSettingsView(unsigned int)
+ ??_ECalenThickLinesDrawer@@UAE@I@Z @ 189 NONAME ; CalenThickLinesDrawer::~CalenThickLinesDrawer(unsigned int)
+ ?metaObject@CalenSettingsView@@UBEPBUQMetaObject@@XZ @ 190 NONAME ; struct QMetaObject const * CalenSettingsView::metaObject(void) const
+ ?getStaticMetaObject@CalenMonthView@@SAABUQMetaObject@@XZ @ 191 NONAME ; struct QMetaObject const & CalenMonthView::getStaticMetaObject(void)
+ ?changeOrientation@CalenMonthView@@EAEXW4Orientation@Qt@@@Z @ 192 NONAME ; void CalenMonthView::changeOrientation(enum Qt::Orientation)
+ ?paint@CalenMonthGrid@@EAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 193 NONAME ; void CalenMonthGrid::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+ ?tr@CalenMonthGrid@@SA?AVQString@@PBD0@Z @ 194 NONAME ; class QString CalenMonthGrid::tr(char const *, char const *)
+ ?qt_metacast@CalenSettingsView@@UAEPAXPBD@Z @ 195 NONAME ; void * CalenSettingsView::qt_metacast(char const *)
+ ?qt_metacall@CalenDayHourScrollArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 196 NONAME ; int CalenDayHourScrollArea::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?qt_metacall@CalenMonthView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 197 NONAME ; int CalenMonthView::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?disconnectAboutToQuitEvent@CalenAgendaView@@QAEXXZ @ 198 NONAME ; void CalenAgendaView::disconnectAboutToQuitEvent(void)
+ ?setActiveDay@CalenMonthView@@AAEXVQDateTime@@@Z @ 199 NONAME ; void CalenMonthView::setActiveDay(class QDateTime)
+ ?itemActivated@CalenMonthGrid@@QAEXABVQModelIndex@@@Z @ 200 NONAME ; void CalenMonthGrid::itemActivated(class QModelIndex const &)
+ ?moveFinished@CalenDayContentScrollArea@@AAEXXZ @ 201 NONAME ; void CalenDayContentScrollArea::moveFinished(void)
+ ?qt_metacall@CalenMonthGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 202 NONAME ; int CalenMonthGrid::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?createEditor@CalenMonthView@@AAEXXZ @ 203 NONAME ; void CalenMonthView::createEditor(void)
+ ??_ECalenPreviewPane@@UAE@I@Z @ 204 NONAME ; CalenPreviewPane::~CalenPreviewPane(unsigned int)
+ ?scrollToHour@CalenDayHourScrollArea@@QAEXH@Z @ 205 NONAME ; void CalenDayHourScrollArea::scrollToHour(int)
+ ?getActiveDay@CalenMonthView@@QAE?AVQDateTime@@XZ @ 206 NONAME ; class QDateTime CalenMonthView::getActiveDay(void)
+ ?addRemoveActionsInMenu@CalenMonthView@@AAEXXZ @ 207 NONAME ; void CalenMonthView::addRemoveActionsInMenu(void)
+ ??1CalenDayContentScrollArea@@UAE@XZ @ 208 NONAME ; CalenDayContentScrollArea::~CalenDayContentScrollArea(void)
--- a/calendarui/views/dayview/inc/calendaycommonheaders.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/inc/calendaycommonheaders.h Fri Sep 17 08:29:05 2010 +0300
@@ -27,9 +27,9 @@
const int KCalenHoursInDay = 24;
/*!
- Number of time slots in hour (half of hour is defined as time slot) (UI spec)
+ Number of time slots in hour (one slot = 15 minutes) (UI spec)
*/
-const int KCalenSlotsInHour = 2;
+const int KCalenSlotsInHour = 4;
/*!
Content area (1/4 of screen) dedicated for All day events in Day View (UI spec)
--- a/calendarui/views/dayview/inc/calendaycontentscrollarea.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/inc/calendaycontentscrollarea.h Fri Sep 17 08:29:05 2010 +0300
@@ -24,6 +24,11 @@
// User includes
#include "calendaycommonheaders.h"
+/*!
+ Value [degree] defines the max. angle of swipe gesture which should change day.
+ */
+const qreal KCalenSwipeAngle = 30;
+
#ifdef CALENVIEWS_DLL
#define CALENDAYCONTENTSCROLLAREA_EXPORT Q_DECL_EXPORT
#else
--- a/calendarui/views/dayview/inc/calendayitemview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/inc/calendayitemview.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,19 +1,19 @@
/*
-* 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: Day view control of calendar
-*
-*/
+ * 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: Day view control of calendar
+ *
+ */
#ifndef CALENDAYITEMVIEW_H
#define CALENDAYITEMVIEW_H
@@ -31,7 +31,7 @@
class CalenDayItemView : public HbAbstractItemView
{
- Q_OBJECT
+ Q_OBJECT
public:
enum CalendarPanDirection {
@@ -46,113 +46,42 @@
CalendarForwardRecycle
};
- /**
- * Constructor.
- */
- CalenDayItemView(MCalenServices &services, HbModelIterator* iterator, QGraphicsItem *parent);
-
- /**
- * Destructor.
- */
+ CalenDayItemView(
+ MCalenServices &services,
+ HbModelIterator* iterator,
+ QGraphicsItem *parent);
~CalenDayItemView();
- /**
- *
- */
- void scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint = EnsureVisible);
+ void scrollTo(
+ const QModelIndex &index,
+ HbAbstractItemView::ScrollHint hint = EnsureVisible);
public slots:
- /**
- *
- */
virtual void reset();
-
- /**
- * Handles signal that is emitted when reset() is called, before the model's
- * internal state (e.g. persistent model indexes) has been invalidated.
- */
void modelAboutToBeReset();
-
- /**
- * Handles signal that is emitted when reset() is called, after the model's
- * internal state (e.g. persistent model indexes) has been invalidated.
- */
void modelReset();
- /**
- *
- */
void scrollVertically(const QPointF &newPosition);
-
+
private slots:
-
- /**
- * This function is called when a touch down event is received within Abstract view item that is representing index.
- */
- void itemPressed(const QPointF &position);
-
- /**
- * This function is called when a touch release event is received within Abstract view item that is representing index.
- */
- void itemReleased(const QPointF &position);
-
- /**
- * This function is called when the item specified by index is activated by the user.
- */
- void itemActivated(const QPointF &position);
-
- /**
- * This function is called when long press event is received within Abstract view item viewItem.
- *
- * @param item The item.
- * @param coords is scene position where the long press event happened
- */
+
+ void itemPressed(const QModelIndex &index);
+ void itemReleased(const QModelIndex &index);
+ void itemActivated(const QModelIndex &index);
void itemLongPressed(HbAbstractViewItem*, QPointF);
-
- /**
- * Slot which is called whenever the orientation of the device changes
- * @param orientation Current device orientation
- */
+
void orientationChanged(Qt::Orientation orientation);
-
- /**
- * Opens currently selected model item.
- */
+
void openSelectedItem();
-
- /**
- * Edits currently selected model item.
- */
void editSelectedItem();
-
- /**
- * Deletes currently selected model item.
- */
- void deleteSelectedItem();
+ void deleteSelectedItem();
private:
-
- /**
- * Connects item view's slots.
- */
+
void setupSlots();
-
- /**
- * Creates Context menu.
- */
void setupContextMenu();
-
- /**
- * Sets context to currently selected model item and issues calendar command.
- *
- * @param command Calendar command.
- */
- bool issueCommandOnSelectedItem( int command );
-
- /**
- * Clears current selection in Selection Model.
- */
+ bool issueCommandOnSelectedItem(int command);
void clearSelectionInModel();
private:
@@ -160,19 +89,19 @@
/**
* Calendar services. Not owned.
*/
- MCalenServices &mServices;
-
+ MCalenServices &mServices;
+
/**
* Item container.
*/
CalenDayContainer* mContainer;
-
+
/**
* Day event info.
* Own.
*/
CalenDayInfo* mInfo;
-
+
/**
* context menu
*/
--- a/calendarui/views/dayview/inc/calendayutils.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/inc/calendayutils.h Fri Sep 17 08:29:05 2010 +0300
@@ -32,6 +32,7 @@
qreal screenWidth() const;
qreal hourElementWidth() const;
qreal hourElementHeight() const;
+ qreal minEventHeight() const;
qreal contentWidth() const;
Qt::Orientation orientation() const;
@@ -56,6 +57,7 @@
private:
qreal calculateHourElementWidth() const;
qreal calculateHourElementHeight() const;
+ qreal calculateMinEventHeight() const;
private: // data
@@ -65,6 +67,7 @@
qreal mHourElementWidth; //!< The width of hour element
qreal mHourElementHeight; //!< The height of hour element
+ qreal mMinEventHeight; //!< The minimum height of event bubble
};
#endif /* CALENDAYUTILS_H_ */
--- a/calendarui/views/dayview/inc/calendayview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/inc/calendayview.h Fri Sep 17 08:29:05 2010 +0300
@@ -92,13 +92,6 @@
*/
virtual void populationComplete();
-//From MCalenNotificationHandler
-
- /**
- * The function handles calendar notifications.
- */
- virtual void HandleNotification( const TCalenNotification notification );
-
public:
//API
@@ -182,6 +175,7 @@
CalenDocLoader* mDocLoader; //!< Document loader for day view
bool mIsLaunching; //!< Indicates that view is launching first time
+ HbWidget *mGesturesAbsorber; //!<Widget that absorbs swipe and pan gestures
private:
--- a/calendarui/views/dayview/src/calendaycontainer.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendaycontainer.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -277,6 +277,9 @@
eventWidth -= mLayoutValues.eventMargin;
}
+ // Verify if height of event is greater than minimum (UI spec)
+ qreal minHeight = CalenDayUtils::instance()->minEventHeight();
+ eventHeight = (eventHeight < minHeight ? minHeight : eventHeight);
QRectF eventGeometry(eventStartX, eventStartY, eventWidth, eventHeight);
// Workaround to prevent size hint caching inside effectiveSizeHint
--- a/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendaycontentscrollarea.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -39,11 +39,6 @@
*/
const int KCalenHScrollMoveParam = 30; //!< Percentage
-/*!
- Value [degree] defines the max. angle of swipe gesture which should change day.
- */
-const qreal KCalenSwipeAngle = 30;
-
/*!
\class CalenDayContentScrollArea
@@ -279,15 +274,19 @@
else {
QGestureEvent* gesture = static_cast<QGestureEvent*> (event);
- // Check if we get a pan gesture
- QPanGesture *panGesture = qobject_cast<QPanGesture*> (
- gesture->gesture(Qt::PanGesture));
+ QPanGesture *panGesture = qobject_cast<QPanGesture*>(gesture->gesture(Qt::PanGesture));
if (panGesture) {
checkPanDirection(panGesture);
if (mPanDayDirection == ECalenPanHorizontal) {
gestureEvent(gesture);
handled = true;
}
+ }else{
+ QSwipeGesture *swipeGesture = qobject_cast<QSwipeGesture*>(gesture->gesture(Qt::SwipeGesture));
+ if (swipeGesture) {
+ gestureEvent(gesture);
+ handled = true;
+ }
}
}
}
--- a/calendarui/views/dayview/src/calendayinfo.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendayinfo.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -21,6 +21,7 @@
#include "calenagendautils.h"
#include "calenconstants.h"
#include "calendateutils.h"
+#include "calendayutils.h"
namespace
{
@@ -50,9 +51,9 @@
iRegionList[i].Close();
}
iRegionList.clear();
- iUntimedEvents.clear();//Close();
- iTodoEvents.clear();//Close();
- iAlldayEvents.clear();//Close();
+ iUntimedEvents.clear();
+ iTodoEvents.clear();
+ iAlldayEvents.clear();
}
/*!
@@ -63,10 +64,10 @@
for (int i = 0; i < iRegionList.count(); i++) {
iRegionList[i].Close();
}
- iRegionList.clear();//Reset();
- iUntimedEvents.clear();//Reset();
- iTodoEvents.clear();//Reset();
- iAlldayEvents.clear();//Reset();
+ iRegionList.clear();
+ iUntimedEvents.clear();
+ iTodoEvents.clear();
+ iAlldayEvents.clear();
iUntimedSlotCount = 0;
iFirstUntimedSlot = KFSCalStartingHour * iSlotsInHour;
@@ -87,8 +88,16 @@
int startIndex = SlotIndexForStartTime(aItemInfo.iStartTime);
int endIndex = SlotIndexForEndTime(aItemInfo.iEndTime);
- if (endIndex == startIndex) {
- endIndex++;
+
+ // 10.1 update: the minimum height of event is defined by UI spec.,
+ // so number of occupied slots must be verified to hold at least bubble
+ // with minimum possible height
+ qreal slotHeight = CalenDayUtils::instance()->hourElementHeight()
+ / iSlotsInHour;
+ int minSlotsInEvent = qRound((CalenDayUtils::instance()->minEventHeight()
+ / slotHeight) + 0.5);
+ if (endIndex < startIndex + minSlotsInEvent) {
+ endIndex = startIndex + minSlotsInEvent;
}
if (iRegionList.count() > 0) {
// the timed events must be added in order
--- a/calendarui/views/dayview/src/calendayitemview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendayitemview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -1,19 +1,19 @@
/*
-* 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: Day view control of calendar
-*
-*/
+ * 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: Day view control of calendar
+ *
+ */
//System includes
#include <QGesture>
@@ -33,137 +33,140 @@
#include "calenagendautils.h"
#include "CalenUid.h"
+/*!
+ \brief Constructor
+ */
+CalenDayItemView::CalenDayItemView(
+ MCalenServices &services,
+ HbModelIterator *iterator,
+ QGraphicsItem *parent) :
+ HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent),
+ mServices(services)
+{
+ mInfo = new CalenDayInfo(CalenDayInfo::EFour);
+ mContainer->setDayInfo(mInfo);
-/*!
- \brief Constructor
-*/
-CalenDayItemView::CalenDayItemView( MCalenServices &services, HbModelIterator *iterator, QGraphicsItem *parent )
-: HbAbstractItemView(mContainer = new CalenDayContainer(), iterator, parent),
- mServices( services )
-{
- mInfo = new CalenDayInfo( CalenDayInfo::ETwo );
- mContainer->setDayInfo( mInfo );
-
//setup Selection Model
QItemSelectionModel* selModel = new QItemSelectionModel(this->model());
- if ( selModel ) {
- setSelectionMode( HbAbstractItemView::SingleSelection );
- setSelectionModel( selModel );
+ if (selModel) {
+ setSelectionMode(HbAbstractItemView::SingleSelection);
+ setSelectionModel(selModel);
}
-
+
setScrollDirections(Qt::Vertical);
setScrollingStyle(HbScrollArea::PanWithFollowOn);
setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
-
+
//TODO: KG: Animate item pressed?! HbAbstractItemView::TouchDown
- setEnabledAnimations( HbAbstractItemView::None );
-
+ setEnabledAnimations(HbAbstractItemView::None);
+
// Get the width of content and fix its size
qreal contentWidth = CalenDayUtils::instance()->contentWidth();
setMinimumWidth(contentWidth);
setMaximumWidth(contentWidth);
-
+
setupSlots();
setupContextMenu();
}
/*!
- \brief Destructor
-*/
+ \brief Destructor
+ */
CalenDayItemView::~CalenDayItemView()
{
delete mInfo;
}
/*!
- \brief Scrolls to given index
-*/
-void CalenDayItemView::scrollTo(const QModelIndex &index, HbAbstractItemView::ScrollHint hint)
+ \brief Scrolls to given index
+ */
+void CalenDayItemView::scrollTo(
+ const QModelIndex &index,
+ HbAbstractItemView::ScrollHint hint)
{
HbAbstractItemView::scrollTo(index, hint);
}
/*!
- \brief Currently empty implementation.
-*/
+ \brief Currently empty implementation.
+ */
void CalenDayItemView::reset()
{
}
-
/*!
- \brief Handles signal that is emitted when reset() is called, before the model's
- internal state (e.g. persistent model indexes) has been invalidated.
-*/
+ \brief Handles signal that is emitted when reset() is called, before the model's
+ internal state (e.g. persistent model indexes) has been invalidated.
+ */
void CalenDayItemView::modelAboutToBeReset()
{
-
+
}
/*!
- \brief Handles signal that is emitted when reset() is called, before the model's
- internal state (e.g. persistent model indexes) has been invalidated.
-*/
+ \brief Handles signal that is emitted when reset() is called, before the model's
+ internal state (e.g. persistent model indexes) has been invalidated.
+ */
void CalenDayItemView::modelReset()
{
- if ( !mInfo ) {
+ if (!mInfo) {
return;
}
//reset day info
mInfo->Reset();
CalenDayModel* model(0);
- model = static_cast<CalenDayModel*>(this->model());
- if ( !model ) {
+ model = static_cast<CalenDayModel*> (this->model());
+ if (!model) {
return;
}
-
+
mContainer->setDate(model->modelDate().date());
- int rowCount = model->rowCount( );
- SCalenApptInfo apptInfo;
- for( int row = 0; row < rowCount; row++ ) {
- QModelIndex idx = model->index( row, 0 );
- QVariant variant = idx.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
+ int rowCount = model->rowCount();
+ SCalenApptInfo apptInfo;
+ for (int row = 0; row < rowCount; row++) {
+ QModelIndex idx = model->index(row, 0);
+ QVariant variant = idx.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
apptInfo.iIndex = idx;
-
+
QDateTime start;
QDateTime end;
- QDateTime currDate( model->modelDate() );
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end,
- entry, currDate );
+ QDateTime currDate(model->modelDate());
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currDate);
apptInfo.iStartTime = start;
apptInfo.iEndTime = end;
-
+
TCalenInstanceId id = TCalenInstanceId::nullInstanceId();//index.row() - temporary ID
id.mEntryLocalUid = row;
- id.mInstanceTime = apptInfo.iStartTime;
+ id.mInstanceTime = apptInfo.iStartTime;
apptInfo.iId = id;
apptInfo.iColor = 0xffff;
-
- if ( entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry))
- {
+
+ if (entry.isTimedEntry() && !CalenAgendaUtils::isAlldayEvent(entry)) {
apptInfo.iAllDay = false;
- mInfo->InsertTimedEvent( apptInfo );
- }
- else if(CalenAgendaUtils::isAlldayEvent(entry)) //all-day event
- {
- apptInfo.iAllDay = true;
- mInfo->InsertAlldayEvent( apptInfo );
- }
+ mInfo->InsertTimedEvent(apptInfo);
+ }
+ else
+ if (CalenAgendaUtils::isAlldayEvent(entry)) //all-day event
+ {
+ apptInfo.iAllDay = true;
+ mInfo->InsertAlldayEvent(apptInfo);
+ }
}
-
+
HbAbstractItemView::reset();
}
/*!
- \brief Scrolls view vertically to the given position.
-
- \param newPosition position to scroll to.
-*/
-void CalenDayItemView::scrollVertically( const QPointF &newPosition )
+ \brief Scrolls view vertically to the given position.
+
+ \param newPosition position to scroll to.
+ */
+void CalenDayItemView::scrollVertically(const QPointF &newPosition)
{
QPointF currentPos = contentWidget()->pos();
if (abs(newPosition.y()) != abs(currentPos.y())) {
@@ -173,107 +176,106 @@
}
/*!
- \brief This function is called when a touch press event is received
- within Abstract view item that is representing index.
- Currently it does nothing.
-*/
-void CalenDayItemView::itemPressed( const QPointF &position )
+ \brief This function is called when a touch press event is received
+ within Abstract view item that is representing index.
+ Currently it does nothing.
+ */
+void CalenDayItemView::itemPressed(const QModelIndex &index)
{
- Q_UNUSED( position )
+ Q_UNUSED( index )
}
/*!
- \brief This function is called when a touch release event is received
- within Abstract view item that is representing index.
- Currently it does nothing.
-*/
-void CalenDayItemView::itemReleased( const QPointF &position )
+ \brief This function is called when a touch release event is received
+ within Abstract view item that is representing index.
+ Currently it does nothing.
+ */
+void CalenDayItemView::itemReleased(const QModelIndex &index)
{
- Q_UNUSED( position )
+ Q_UNUSED( index )
}
/*!
- \brief This function is called when the item specified by index is activated by the user.
-
- \param position Not used.
-*/
-void CalenDayItemView::itemActivated( const QPointF &position )
+ \brief This function is called when the item specified by index is activated by the user.
+
+ \param position Not used.
+ */
+void CalenDayItemView::itemActivated(const QModelIndex &index)
{
- Q_UNUSED( position )
- HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender());
- QModelIndex index = item->modelIndex();
- QItemSelectionModel* selModel( selectionModel() );
- if ( index.isValid() && selModel) {
- selModel->select( index, QItemSelectionModel::Current | QItemSelectionModel::Select );
+ QItemSelectionModel* selModel(selectionModel());
+ if (index.isValid() && selModel) {
+ selModel->select(index, QItemSelectionModel::Current
+ | QItemSelectionModel::Select);
openSelectedItem();
}
}
/*!
- \brief This function is called when long press event is received within Abstract view item viewItem.
+ \brief This function is called when long press event is received within Abstract view item viewItem.
- \param item Pointer to pressed item.
- \param coord Position where item was pressed.
-*/
+ \param item Pointer to pressed item.
+ \param coord Position where item was pressed.
+ */
void CalenDayItemView::itemLongPressed(HbAbstractViewItem* item, QPointF coords)
{
QModelIndex index = item->modelIndex();
- QItemSelectionModel* selModel( selectionModel() );
- if ( index.isValid() && selModel && mContextMenu) {
- selModel->select( index, QItemSelectionModel::Current | QItemSelectionModel::Select );
- mContextMenu->setPreferredPos( coords, HbPopup::BottomRightCorner );
+ QItemSelectionModel* selModel(selectionModel());
+ if (index.isValid() && selModel && mContextMenu) {
+ selModel->select(index, QItemSelectionModel::Current
+ | QItemSelectionModel::Select);
+ mContextMenu->setPreferredPos(coords, HbPopup::BottomRightCorner);
mContextMenu->open();
}
}
/*!
- \brief Slot which is called whenever the orientation of the device changes.
+ \brief Slot which is called whenever the orientation of the device changes.
- \param orientation New orientation.
-*/
-void CalenDayItemView::orientationChanged( Qt::Orientation orientation )
+ \param orientation New orientation.
+ */
+void CalenDayItemView::orientationChanged(Qt::Orientation orientation)
{
// Update the width of screen
qreal contentWidth = CalenDayUtils::instance()->contentWidth();
setMinimumWidth(contentWidth);
setMaximumWidth(contentWidth);
- if( mContainer ) {
- mContainer->orientationChanged( orientation );
+ if (mContainer) {
+ mContainer->orientationChanged(orientation);
}
}
/*!
- \brief Opens currently selected model item.
-*/
+ \brief Opens currently selected model item.
+ */
void CalenDayItemView::openSelectedItem()
{
- issueCommandOnSelectedItem( ECalenEventView );
+ issueCommandOnSelectedItem(ECalenEventView);
}
/*!
- \brief Edits currently selected model item.
-*/
+ \brief Edits currently selected model item.
+ */
void CalenDayItemView::editSelectedItem()
{
- issueCommandOnSelectedItem( ECalenEditCurrentEntry );
+ issueCommandOnSelectedItem(ECalenEditCurrentEntry);
}
/*!
- \brief Deletes currently selected model item.
-*/
+ \brief Deletes currently selected model item.
+ */
void CalenDayItemView::deleteSelectedItem()
{
- issueCommandOnSelectedItem( ECalenDeleteCurrentEntry );
+ issueCommandOnSelectedItem(ECalenDeleteCurrentEntry);
}
/*!
- \brief Connects item view's slots.
-*/
+ \brief Connects item view's slots.
+ */
void CalenDayItemView::setupSlots()
{
// Connect to main window's orientationChanged signal to handle orientation
// switching
- QObject::connect(CalenDayUtils::instance()->mainWindow(),
+ QObject::connect(CalenDayUtils::instance()->mainWindow(),
SIGNAL(orientationChanged(Qt::Orientation)), this,
SLOT(orientationChanged(Qt::Orientation)));
@@ -289,31 +291,34 @@
QObject::connect(mContainer, SIGNAL(itemCreated(HbAbstractViewItem *)),
this, SLOT(itemCreated(HbAbstractViewItem*)));
}
- QObject::connect(this, SIGNAL(pressed(const QPointF&)), this,
- SLOT(itemPressed(const QPointF&)));
- QObject::connect(this, SIGNAL(released(const QPointF&)), this,
- SLOT(itemReleased(const QPointF&)));
- QObject::connect(this, SIGNAL(activated(const QPointF&)), this,
- SLOT(const QPointF&));
+ QObject::connect(this, SIGNAL(pressed(const QModelIndex&)), this,
+ SLOT(itemPressed(const QModelIndex&)));
+ QObject::connect(this, SIGNAL(released(const QModelIndex&)), this,
+ SLOT(itemReleased(const QModelIndex&)));
+ QObject::connect(this, SIGNAL(activated(const QModelIndex&)), this,
+ SLOT(itemActivated(const QModelIndex&)));
QObject::connect(this, SIGNAL(longPressed(HbAbstractViewItem*, QPointF)),
this, SLOT(itemLongPressed(HbAbstractViewItem*, QPointF)));
}
/*!
- \brief Creates context menu.
-*/
+ \brief Creates context menu.
+ */
void CalenDayItemView::setupContextMenu()
{
mContextMenu = new HbMenu();
- HbAction *openAction = mContextMenu->addAction(hbTrId("txt_common_menu_open"));
+ HbAction *openAction = mContextMenu->addAction(hbTrId(
+ "txt_common_menu_open"));
if (openAction) {
connect(openAction, SIGNAL(triggered()), this, SLOT(openSelectedItem()));
}
- HbAction *editAction = mContextMenu->addAction(hbTrId("txt_common_menu_edit"));
+ HbAction *editAction = mContextMenu->addAction(hbTrId(
+ "txt_common_menu_edit"));
if (editAction) {
connect(editAction, SIGNAL(triggered()), this, SLOT(editSelectedItem()));
}
- HbAction *deleteAction = mContextMenu->addAction(hbTrId("txt_common_menu_delete"));
+ HbAction *deleteAction = mContextMenu->addAction(hbTrId(
+ "txt_common_menu_delete"));
if (deleteAction) {
connect(deleteAction, SIGNAL(triggered()), this,
SLOT(deleteSelectedItem()));
@@ -321,35 +326,35 @@
}
/*!
- \brief Sets context to currently selected model item and issues calendar command.
-
- \param command A command to be issued.
-*/
-bool CalenDayItemView::issueCommandOnSelectedItem( int command )
+ \brief Sets context to currently selected model item and issues calendar command.
+
+ \param command A command to be issued.
+ */
+bool CalenDayItemView::issueCommandOnSelectedItem(int command)
{
bool retVal(false);
QItemSelectionModel* selModel(selectionModel());
- if (!selModel){
+ if (!selModel) {
return retVal;
}
- QModelIndex index( selModel->currentIndex() );
- if( index.isValid() ) {
+ QModelIndex index(selModel->currentIndex());
+ if (index.isValid()) {
retVal = true;
- QVariant variant = index.data( CalenDayEntry );
- AgendaEntry entry = variant.value<AgendaEntry>();
+ QVariant variant = index.data(CalenDayEntry);
+ AgendaEntry entry = variant.value<AgendaEntry> ();
QDateTime start;
QDateTime end;
CalenDayModel* model(0);
- model = static_cast<CalenDayModel*>(this->model());
- QDateTime currDate( model->modelDate() );
- CalenDayUtils::instance()->getEventValidStartEndTime( start, end,
- entry, currDate );
+ model = static_cast<CalenDayModel*> (this->model());
+ QDateTime currDate(model->modelDate());
+ CalenDayUtils::instance()->getEventValidStartEndTime(start, end, entry,
+ currDate);
TRAPD(error,
- mServices.Context().setFocusDateAndTimeAndInstance(start,
- TCalenInstanceId::create(entry));
- mServices.IssueCommandL( command );
- );
- if( error ) {
+ mServices.Context().setFocusDateAndTimeAndInstance(start,
+ TCalenInstanceId::create(entry));
+ mServices.IssueCommandL( command );
+ );
+ if (error) {
retVal = false;
}
clearSelectionInModel();
@@ -358,8 +363,8 @@
}
/*!
- \brief Clears current selection in Selection Model.
-*/
+ \brief Clears current selection in Selection Model.
+ */
void CalenDayItemView::clearSelectionInModel()
{
QItemSelectionModel* selModel(selectionModel());
--- a/calendarui/views/dayview/src/calendaystatusstrip.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendaystatusstrip.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -22,6 +22,7 @@
// User includes
#include "calendaystatusstrip.h"
+#include "calendayutils.h"
// Constants
qreal const CalenDayStatusStrip::mMinute = 60;
@@ -123,10 +124,10 @@
}
/*!
- \brief Reimplemented function...
-
- Reimplemented function to draw status strip.
- It is based on CalenDayStatusStrip::DrawingStyle, range and color
+ \brief Reimplemented function...
+
+ Reimplemented function to draw status strip.
+ It is based on CalenDayStatusStrip::DrawingStyle, range and color
*/
void CalenDayStatusStrip::paint(
QPainter *painter,
@@ -136,45 +137,39 @@
Q_UNUSED(option);
Q_UNUSED(widget);
- //calculate bubble start and end time of bubble
- QPair<QTime, QTime> startEndEvent =
- calculateStartEndPostion(mStartEndEventTime.first,
- mStartEndEventTime.second
- );
- //calculate how big is Minute
- qreal minuteHeight = calculateMinuteHeight(startEndEvent.first,
- startEndEvent.second
- );
+ painter->save();// saves the painter state.
- painter->save();// saves the painter state.
-
-
- //calculate how long is event in minutes
- qreal eventMinutes =
- mStartEndEventTime.first.secsTo(mStartEndEventTime.second) / mMinute;
- //calculate height and width of status stripe
+ // Calculate bubble start and end time of bubble
+ QPair<QTime, QTime> startEndEvent = calculateStartEndPostion(
+ mStartEndEventTime.first, mStartEndEventTime.second);
+ // Calculate how high is Minute
+ qreal minuteHeight = calculateMinuteHeight(startEndEvent.first,
+ startEndEvent.second);
+ // Calculate how long is event in minutes
+ qreal eventMinutes = mStartEndEventTime.first.secsTo(
+ mStartEndEventTime.second) / mMinute;
+ // Calculate height and width of status stripe
qreal dx = size().width() - 1;
qreal dy = eventMinutes * minuteHeight;
- //calculate time from wehre it should be drawed
- qreal startTime =
- startEndEvent.first.secsTo(mStartEndEventTime.first) / mMinute;
- //this is done because bubble can be drawed from half hour
- startTime = startTime > 30 ? startTime - 30 : startTime;
- //calculate status stripe height
+ // Calculate time from wehre it should be drawed
+ qreal startTime = startEndEvent.first.secsTo(mStartEndEventTime.first)
+ / mMinute;
+ // This is done because bubble positioning accuracy is 15 minutes
+ startTime = startTime > 15 ? startTime - 15 : startTime;
+ // Calculate status stripe height
qreal startTimeHeight = startTime * minuteHeight;
- //set bounding rect of drawed area
+ // Set bounding rect of drawed area
QRectF bounding(boundingRect());
- //set size smaller by 1px in each side
- bounding.setRect(bounding.left() + 1, bounding.top() + startTimeHeight,
- dx - 1, dy - 1
- );
+ // Set size smaller by 1px in each side
+ bounding.setRect(bounding.left() + 1, bounding.top() + startTimeHeight, dx
+ - 1, dy - 1);
- //set clip region
+ // Set clip region
painter->setClipRect(bounding, Qt::IntersectClip);
- //prepare brush and paint
+ // Prepare brush and paint
QBrush brush(HbColorScheme::color("qtc_cal_month_current_day"));
painter->setBrush(brush);
QPen pen;
@@ -185,7 +180,7 @@
painter->setPen(pen);
QPointF startPoint(0, dy + dx);
-
+
switch (mDrawingStyle) {
case StripWithLines:
for (int i = 0; startPoint.y() > 0; i++) {
@@ -197,19 +192,20 @@
break;
}
- //draw rectangle
+ // Draw rectangle
painter->drawRect(bounding);
- // restore the painter
+ // Restore the painter
painter->restore();
}
/*!
- \brief It preapres points to draw filled polygon when StripWithLines style is
- on.
+ \brief Prepares points to draw filled polygon when StripWithLines style is on.
*/
-QPolygonF
-CalenDayStatusStrip::diagonalLine(QPointF startPoint, qreal dx, qreal dy)
+QPolygonF CalenDayStatusStrip::diagonalLine(
+ QPointF startPoint,
+ qreal dx,
+ qreal dy)
{
QPolygonF polygon;
polygon << QPointF(startPoint.x(), startPoint.y());
@@ -220,53 +216,82 @@
}
/*!
- Returns time for position 0 and height in widget
-
- \param startTime Start of event
- \param endTime End of event
- \return Draw region of bubble
- */
- QPair<QTime,QTime> CalenDayStatusStrip::calculateStartEndPostion(
- const QTime &startTime,
- const QTime &endTime
- )
+ \brief Returns time for position 0 and height in widget
+
+ \param startTime Start of event
+ \param endTime End of event
+ \return Draw region of bubble
+ */
+QPair<QTime, QTime> CalenDayStatusStrip::calculateStartEndPostion(
+ const QTime &startTime,
+ const QTime &endTime)
{
-
QTime start;
QTime end;
- if (startTime.minute() < 30) {
+ if (startTime.minute() < 15) {
start = QTime(startTime.hour(), 0);
}
- else {
- start = QTime(startTime.hour(), 30);
- }
+ else
+ if (startTime.minute() < 30) {
+ start = QTime(startTime.hour(), 15);
+ }
+ else
+ if (startTime.minute() < 45) {
+ start = QTime(startTime.hour(), 30);
+ }
+ else {
+ start = QTime(startTime.hour(), 45);
+ }
if (endTime.minute() == 0) {
end = endTime;
}
- else if (endTime.hour() == 23 and endTime.minute() > 30) {
- end = QTime(endTime.hour(), 59);
- }
- else if (endTime.minute() <= 30) {
- end = QTime(endTime.hour(), 30);
- }
- else {
- end = QTime(endTime.hour() + 1, 0);
- }
+ else
+ if (endTime.hour() == 23 and endTime.minute() > 45) {
+ end = QTime(endTime.hour(), 59);
+ }
+ else
+ if (endTime.minute() <= 15) {
+ end = QTime(endTime.hour(), 15);
+ }
+ else
+ if (endTime.minute() <= 30) {
+ end = QTime(endTime.hour(), 30);
+ }
+ else
+ if (endTime.minute() <= 45) {
+ end = QTime(endTime.hour(), 45);
+ }
+ else {
+ end = QTime(endTime.hour() + 1, 0);
+ }
return QPair<QTime, QTime> (start, end);
}
/*!
- Calculates height of one minute from widget height, and start/end time.
+ Calculates height of one minute from widget height, and start/end time.
*/
-qreal CalenDayStatusStrip::calculateMinuteHeight(const QTime &start,
- const QTime &end)
+qreal CalenDayStatusStrip::calculateMinuteHeight(
+ const QTime &start,
+ const QTime &end)
{
qreal min = start.secsTo(end) / mMinute;
- qreal height = size().height();
+ // Events shorter than 30 minutes have bubble higher than 30 minutes,
+ // so calculate minute's height using real hour-element slot height
+ qreal height = 0.0;
+ if (min > 30) {
+ height = size().height();
+ }
+ else
+ if (min > 15) {
+ height = CalenDayUtils::instance()->hourElementHeight() / 2;
+ }
+ else {
+ height = CalenDayUtils::instance()->hourElementHeight() / 4;
+ }
return height / min;
}
--- a/calendarui/views/dayview/src/calendayutils.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendayutils.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -97,6 +97,16 @@
}
/*!
+ \brief minEventHeight
+
+ \return Minimum height of event bubble
+ */
+qreal CalenDayUtils::minEventHeight() const
+{
+ return mMinEventHeight;
+}
+
+/*!
\brief contentWidth
\return Width of content area
@@ -160,6 +170,7 @@
}
mHourElementWidth = calculateHourElementWidth();
mHourElementHeight = calculateHourElementHeight();
+ mMinEventHeight = calculateMinEventHeight();
}
/*!
@@ -215,3 +226,27 @@
return prefHeight;
}
+
+/*!
+ \brief Calculates the height of hour element according to UI spec.
+
+ \return Calculated minimum height of event bubble
+ */
+qreal CalenDayUtils::calculateMinEventHeight() const
+{
+ HbStyle style;
+ HbDeviceProfile deviceProfile;
+
+ // Calculate minimum height of event bubble
+ qreal textHeight = 0.0;
+ qreal topSpacing = 0.0;
+ qreal bottomSpacing = 0.0;
+ style.parameter(QString("hb-param-text-height-secondary"), textHeight,
+ deviceProfile);
+ style.parameter(QString("hb-param-margin-gene-top"), topSpacing,
+ deviceProfile);
+ style.parameter(QString("hb-param-margin-gene-bottom"), bottomSpacing,
+ deviceProfile);
+
+ return (topSpacing + textHeight + bottomSpacing);
+}
--- a/calendarui/views/dayview/src/calendayview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/src/calendayview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -60,7 +60,8 @@
mDocLoader(NULL), mIsLaunching(true), mSettingsManager(NULL),
mRegionalInfoKey(XQSettingsKey::TargetCentralRepository,
KCRUidCalendar, KCalendarShowRegionalInfo), mServices(services),
- mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL), mBg(NULL)
+ mRegionalInfoGroupBox(NULL), mGoToTodayMenuAction(NULL), mBg(NULL),
+ mGesturesAbsorber(NULL)
{
setupMenu();
@@ -143,6 +144,16 @@
} else {
setupViewport();
}
+
+ //Set gestures absorber
+ if (!mGesturesAbsorber) {
+ mGesturesAbsorber = new HbWidget(this);
+ mGesturesAbsorber->setZValue(100);
+ mGesturesAbsorber->grabGesture(Qt::SwipeGesture);
+ mGesturesAbsorber->grabGesture(Qt::PanGesture);
+ mGesturesAbsorber->setGeometry(rect());
+ mGesturesAbsorber->installEventFilter(mContentScrollArea);
+ }
populationComplete();
}
@@ -156,17 +167,6 @@
}
/*!
- \brief Reimplemented from MCalenNotificationHandler. The function handles calendar notifications
-
- \param notification notification type
-*/
-void CalenDayView::HandleNotification(const TCalenNotification notification)
-{
- Q_UNUSED( notification )
-}
-
-
-/*!
\brief Sets up the view accroding to the 'xml'
\param docLoader Pointer to document loader
@@ -284,20 +284,23 @@
*/
void CalenDayView::setupMenu()
{
- menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting()));
- //get pointer to this position, because need to change visibility
- mGoToTodayMenuAction = menu()->addAction(hbTrId("txt_calendar_opt_go_to_today"), this, SLOT(runGoToToday()));
- menu()->addAction(hbTrId("txt_calendar_opt_go_to_date"), this, SLOT(goToDate()));
- //TODO: Add id for this text
- //"Switch to Agenda view"
- menu()->addAction(hbTrId("txt_calendar_opt_switch_to_agenda_view"), this, SLOT(runChangeToAgendaView()));
- //TODO: Add id for this text (lunar data)
- //"Show lunar data"
- if (pluginEnabled())
- {
+ menu()->addAction(hbTrId("txt_calendar_opt_new_event"), this, SLOT(runNewMeeting()));
+ //get pointer to this position, because need to change visibility
+ mGoToTodayMenuAction = menu()->addAction(hbTrId("txt_calendar_opt_go_to_today"), this, SLOT(runGoToToday()));
+ menu()->addAction(hbTrId("txt_calendar_opt_go_to_date"), this, SLOT(goToDate()));
+ //TODO: Add id for this text
+ //"Switch to Agenda view"
+ menu()->addAction(hbTrId("txt_calendar_opt_switch_to_agenda_view"), this, SLOT(runChangeToAgendaView()));
+ //TODO: Add id for this text (lunar data)
+ //"Show lunar data"
+ if (pluginEnabled())
+ {
menu()->addAction(hbTrId("txt_calendar_opt_show_lunar_data"), this, SLOT(runLunarData()));
- }
- menu()->addAction(hbTrId("txt_calendar_opt_settings"), this, SLOT(launchSettingsView()));
+ }
+ menu()->addAction(hbTrId("txt_calendar_opt_settings"), this, SLOT(launchSettingsView()));
+
+ // Close the menu once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close()));
}
/*!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/HbInstance Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbinstance.h"
\ No newline at end of file
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbinstance.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbinstance.h Fri Sep 17 08:29:05 2010 +0300
@@ -11,56 +11,15 @@
*
* Contributors:
*
-* Description: Mocked classes for testing CalenDayUtils class
+* Description: Mocked classes for testing CalenDayContainer class
*
*/
-#ifndef HBMAINWINDOW_H
-#define HBMAINWINDOW_H
-
-#include <HbView>
-
-// Test variables
-extern QRectF gTestWindowRect;
-extern Qt::Orientation gTestOrientation;
-
-/*!
- Mocked class HbMainWindow (simulating window in unittests)
- */
-class HbMainWindow
-{
-public:
- HbMainWindow() {
- mView = new HbView();
- }
-
- ~HbMainWindow() {
- if (mView) {
- delete mView;
- mView = 0;
- }
- }
-
- QRectF layoutRect() const {
- return gTestWindowRect;
- }
-
- Qt::Orientation orientation() const {
- return gTestOrientation;
- }
-
- HbView *HbMainWindow::currentView() const {
- return mView;
- }
-
- HbView *mView;
-};
-
-#endif // HBMAINWINDOW_H
#ifndef HBINSTANCE_H
#define HBINSTANCE_H
+#include "hbmainwindow.h"
#include <QList>
/*!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/hbmainwindow.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,59 @@
+/*
+* 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: Mocked classes for testing CalenDayUtils class
+*
+*/
+
+#ifndef HBMAINWINDOW_H
+#define HBMAINWINDOW_H
+
+#include <HbView>
+
+// Test variables
+extern QRectF gTestWindowRect;
+extern Qt::Orientation gTestOrientation;
+
+/*!
+ Mocked class HbMainWindow (simulating window in unittests)
+ */
+class HbMainWindow
+{
+public:
+ HbMainWindow() {
+ mView = new HbView();
+ }
+
+ ~HbMainWindow() {
+ if (mView) {
+ delete mView;
+ mView = 0;
+ }
+ }
+
+ QRectF layoutRect() const {
+ return gTestWindowRect;
+ }
+
+ Qt::Orientation orientation() const {
+ return gTestOrientation;
+ }
+
+ HbView *HbMainWindow::currentView() const {
+ return mView;
+ }
+
+ HbView *mView;
+};
+
+#endif // HBMAINWINDOW_H
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontainer/unittest_calendaycontainer.pro Fri Sep 17 08:29:05 2010 +0300
@@ -37,11 +37,14 @@
# Input
HEADERS += calendaycontainertest.h \
calendaycontainer.h \
+ hbinstance.h \
+ hbmainwindow.h \
calendayutils.h \
calendayeventspane.h \
calendayitem.h \
calendaystatusstrip.h \
- calendaymodel.h
+ calendaymodel.h
+
SOURCES += unittest_calendaycontainer.cpp \
calendaycontainer.cpp \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbInstance Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbinstance.h"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/HbSwipeGesture Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbswipegesture.h"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbinstance.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,59 @@
+/*
+ * 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: Mocked classes for testing CalenDayContainer class
+ *
+ */
+
+#ifndef HBINSTANCE_H
+#define HBINSTANCE_H
+
+#include "hbmainwindow.h"
+#include <QList>
+
+/*!
+ Mocked class HbInstance (simulating hbinstance in unittests)
+ */
+class HbInstance
+{
+public:
+
+ static HbInstance *instance()
+ {
+ return new HbInstance();
+ }
+
+ QList<HbMainWindow *> allMainWindows() const
+ {
+ return mMainWindows;
+ }
+
+ HbInstance()
+ {
+ HbMainWindow* window = new HbMainWindow();
+ mMainWindows.append(window);
+ }
+
+ ~HbInstance()
+ {
+ for (int i = 0; i < mMainWindows.count(); i++) {
+ delete mMainWindows[i];
+ }
+ mMainWindows.clear();
+ }
+
+ QList<HbMainWindow *> mMainWindows;
+};
+
+#endif // HBINSTANCE_H
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbmainwindow.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Mocked classes for testing CalenDayUtils class
+ *
+ */
+
+#ifndef HBMAINWINDOW_H
+#define HBMAINWINDOW_H
+
+#include <HbView>
+
+// Test variables
+extern QRectF gTestWindowRect;
+extern Qt::Orientation gTestOrientation;
+
+/*!
+ Mocked class HbMainWindow (simulating window in unittests)
+ */
+class HbMainWindow : public QObject
+{
+public:
+ HbMainWindow()
+ {
+ mView = new HbView();
+ }
+
+ ~HbMainWindow()
+ {
+ if (mView) {
+ delete mView;
+ mView = 0;
+ }
+ }
+
+ QRectF layoutRect() const
+ {
+ return gTestWindowRect;
+ }
+
+ Qt::Orientation orientation() const
+ {
+ return gTestOrientation;
+ }
+
+ HbView *HbMainWindow::currentView() const
+ {
+ return mView;
+ }
+
+ HbView *mView;
+
+signals:
+ void orientationChanged(Qt::Orientation orientation);
+};
+
+#endif // HBMAINWINDOW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/hbswipegesture.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * 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: Mocked classes for testing CalenDayContentScrollArea class
+ *
+ */
+
+#ifndef HBSWIPEGESTURE_H_
+#define HBSWIPEGESTURE_H_
+
+#include <QSwipeGesture>
+
+// Test variables
+extern Qt::GestureState gTestGestureState;
+extern qreal gTestSceneSwipeAngle;
+extern QSwipeGesture::SwipeDirection gTestSceneHorizontalDirection;
+
+/*!
+ Mocked class HbSwipeGesture
+ */
+class HbSwipeGesture : public QSwipeGesture
+{
+ Q_OBJECT
+
+public:
+ explicit HbSwipeGesture(QObject *parent = 0) {
+ Q_UNUSED(parent)
+ }
+ ~HbSwipeGesture() {}
+
+ qreal sceneSwipeAngle() const {
+ return gTestSceneSwipeAngle;
+ }
+
+ SwipeDirection sceneHorizontalDirection() const {
+ return gTestSceneHorizontalDirection;
+ }
+
+ Qt::GestureState state() const {
+ return gTestGestureState;
+ }
+};
+
+#endif /* HBSWIPEGESTURE_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/rom/unittest_calendaycontentscrollarea.iby Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2006-2007 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: Image description file for test project
+*
+*/
+
+#ifndef UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY
+#define UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY
+
+S60_APP_EXE(unittest_calendaycontentscrollarea)
+S60_APP_RESOURCE(unittest_calendaycontentscrollarea)
+
+// Application registration file.
+data=DATAZ_\private\10003a3f\import\apps\unittest_calendaycontentscrollarea_reg.rsc \private\10003a3f\import\apps\unittest_calendaycontentscrollarea_reg.rsc
+
+
+#endif // UNITTEST_CALENDAYCONTENTSCROLLAREA_IBY
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,463 @@
+/*
+ * 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: Test class for CalenDayContentScrollArea
+ *
+ */
+#include <QGraphicsItem>
+#include <QGraphicsScene>
+#include <QtTest/QtTest>
+#include <QGesture>
+#include <QPanGesture>
+
+#include <HbStyleLoader>
+#include <HbWidget>
+#include <HbSwipeGesture>
+
+#define private public
+#define protected public
+
+#include "calendaycontentscrollarea.h"
+
+// Test variables
+qreal gTestScrollAreaWidth = 300;
+qreal gTestScrollAreaHeight = 200;
+QRectF gTestWindowRect = QRectF(0, 0, gTestScrollAreaWidth, gTestScrollAreaHeight);
+Qt::Orientation gTestOrientation = Qt::Vertical;
+Qt::GestureState gTestGestureState = Qt::NoGesture;
+qreal gTestSceneSwipeAngle = 0.0;
+QSwipeGesture::SwipeDirection gTestSceneHorizontalDirection = QSwipeGesture::NoDirection;
+
+class TestCalenDayContentScrollArea : public QObject
+{
+Q_OBJECT
+
+public:
+ TestCalenDayContentScrollArea();
+ virtual ~TestCalenDayContentScrollArea();
+
+private slots:
+ void initTestCase();
+ void cleanupTestCase();
+ void init();
+ void cleanup();
+
+ void testConstructors();
+ void testScrollToMiddleWidget();
+ void testScrollByAmount();
+ void testGestureEvent();
+ void testEventFilter();
+ void testEvent();
+ void testMoveTo();
+ void testHorizontalSwipe();
+ void testMoveFinished();
+ void testOrientationChanged();
+
+private:
+ CalenDayContentScrollArea *mContentScrollArea;
+};
+
+/*!
+ Constructor
+ */
+TestCalenDayContentScrollArea::TestCalenDayContentScrollArea() :
+ mContentScrollArea(NULL)
+{
+
+}
+
+/*!
+ Destructor
+ */
+TestCalenDayContentScrollArea::~TestCalenDayContentScrollArea()
+{
+
+}
+
+/*!
+ Called before testcase
+ */
+void TestCalenDayContentScrollArea::initTestCase()
+{
+ HbStyleLoader::registerFilePath(":/calendayhourelement.css");
+ HbStyleLoader::registerFilePath(":/calendayhourelement.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayitem.css");
+ HbStyleLoader::registerFilePath(":/calendayitem.widgetml");
+ HbStyleLoader::registerFilePath(":/calendayeventspane.css");
+}
+
+/*!
+ Called after testcase
+ */
+void TestCalenDayContentScrollArea::cleanupTestCase()
+{
+
+}
+
+/*!
+ Called before every function
+ */
+void TestCalenDayContentScrollArea::init()
+{
+ // Create and configure scroll area
+ mContentScrollArea = new CalenDayContentScrollArea();
+ mContentScrollArea->setScrollDirections(Qt::Horizontal | Qt::Vertical);
+ mContentScrollArea->resize(gTestScrollAreaWidth, gTestScrollAreaHeight);
+
+ // Create and set content widget
+ qreal contentWidth = mContentScrollArea->mContentWidth;
+ HbWidget *contentWidget = new HbWidget();
+ contentWidget->resize(3*contentWidth, 2*gTestScrollAreaHeight);
+ mContentScrollArea->setContentWidget(contentWidget);
+}
+
+/*!
+ Called after everyfunction
+ */
+void TestCalenDayContentScrollArea::cleanup()
+{
+ if (mContentScrollArea) {
+ delete mContentScrollArea;
+ mContentScrollArea = NULL;
+ }
+}
+
+/*!
+ Test function for constructors
+ 1. Test if content scroll area is not initialized
+ 2. Test if content scroll area is correcty created
+ */
+void TestCalenDayContentScrollArea::testConstructors()
+{
+ //1)
+ CalenDayContentScrollArea *testContentScrollArea = 0;
+ QVERIFY(!testContentScrollArea);
+
+ testContentScrollArea = new CalenDayContentScrollArea();
+ QVERIFY(testContentScrollArea);
+
+ delete testContentScrollArea;
+}
+
+/*!
+ Test function for scrollToMiddleWidget
+ 1. Test if content widget is available
+ 2. Test initial position of content widget
+ 3. Test the position of content widget after scrolling
+ */
+void TestCalenDayContentScrollArea::testScrollToMiddleWidget()
+{
+ //1)
+ QVERIFY(mContentScrollArea->contentWidget());
+
+ //2)
+ QPointF pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(pos.x(), abs(0.0));
+ QCOMPARE(pos.y(), abs(0.0));
+
+ //3)
+ qreal contentWidth = mContentScrollArea->mContentWidth;
+ mContentScrollArea->scrollToMiddleWidget();
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(contentWidth));
+ QCOMPARE(abs(pos.y()), abs(0.0));
+}
+
+/*!
+ Test function for scrollToMiddleWidget
+ 1. Test if content widget is available
+ 2. Test initial position of content widget
+ 3. Test the position of content widget after vertical gesture
+ 4. Test the position of content widget after horizontal gesture
+ 5. Test the position of content widget after non-specified gesture
+ */
+void TestCalenDayContentScrollArea::testScrollByAmount()
+{
+ //1)
+ QVERIFY(mContentScrollArea->contentWidget());
+
+ //2)
+ QPointF pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(0.0));
+ QCOMPARE(abs(pos.y()), abs(0.0));
+
+ //3)
+ QPointF delta(50.0, 25.0);
+ mContentScrollArea->mPanDayDirection
+ = CalenDayContentScrollArea::ECalenPanVertical;
+ mContentScrollArea->scrollByAmount(delta);
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(0.0));
+ QCOMPARE(abs(pos.y()), abs(delta.y()));
+
+ //4)
+ mContentScrollArea->mPanDayDirection
+ = CalenDayContentScrollArea::ECalenPanHorizontal;
+ mContentScrollArea->scrollByAmount(delta);
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(delta.x()));
+ QCOMPARE(abs(pos.y()), abs(delta.y()));
+
+ //5)
+ QPointF newDelta(5.0, 5.0);
+ delta += newDelta;
+ mContentScrollArea->mPanDayDirection
+ = CalenDayContentScrollArea::ECalenPanNotSet;
+ mContentScrollArea->scrollByAmount(newDelta);
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(delta.x()));
+ QCOMPARE(abs(pos.y()), abs(delta.y()));
+}
+
+/*!
+ Test function for gestureEvent
+ 1. Call gestureEvent with QPanGesture (nothing should happen)
+ 2. Call gestureEvent with HbSwipeGesture, vertical movement
+ KCalenSwipeAngle < angle < 180 - KCalenSwipeAngle
+ 3. Call gestureEvent with HbSwipeGesture, horizontal movement right
+ angle < KCalenSwipeAngle
+ 4. Call gestureEvent with HbSwipeGesture, horizontal movement left
+ 180.0 - KCalenSwipeAngle < angle < 180.0
+ */
+void TestCalenDayContentScrollArea::testGestureEvent()
+{
+ QGestureEvent *gestureEvent = NULL;
+ mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange;
+
+ //1)
+ QList<QGesture*> list;
+ QPanGesture *panGesture = new QPanGesture();
+ list.append(panGesture);
+ gestureEvent = new QGestureEvent(list);
+ mContentScrollArea->gestureEvent(gestureEvent);
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ delete gestureEvent;
+ gestureEvent = NULL;
+
+ //2)
+ HbSwipeGesture *swipeGesture = new HbSwipeGesture();
+ list.append(swipeGesture);
+ gTestGestureState = Qt::GestureStarted;
+ gTestSceneSwipeAngle = KCalenSwipeAngle + 1.0;
+ gestureEvent = new QGestureEvent(list);
+ mContentScrollArea->gestureEvent(gestureEvent);
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ //3)
+ gTestGestureState = Qt::GestureStarted;
+ gTestSceneSwipeAngle = KCalenSwipeAngle - 1.0;
+ gTestSceneHorizontalDirection = QSwipeGesture::Right;
+ mContentScrollArea->gestureEvent(gestureEvent);
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollToPrev);
+
+ //4)
+ gTestGestureState = Qt::GestureStarted;
+ gTestSceneSwipeAngle = 180.0 - KCalenSwipeAngle + 1.0;
+ gTestSceneHorizontalDirection = QSwipeGesture::Left;
+ mContentScrollArea->gestureEvent(gestureEvent);
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollToNext);
+
+ delete gestureEvent;
+}
+
+/*!
+ Test function for eventFilter
+ 1. Call eventFilter with event type: None
+ 2. Call eventFilter with event type: Gesture, scroll area is moving
+ 3. Call eventFilter with event type: Gesture, scroll area area not moving,
+ swipe gesture
+ */
+void TestCalenDayContentScrollArea::testEventFilter()
+{
+ bool result = false;
+
+ //1)
+ QEvent noneEvent(QEvent::None);
+ result = mContentScrollArea->eventFilter(NULL, &noneEvent);
+ QVERIFY(!result); //false
+
+ //2)
+ QEvent gestureEvent(QEvent::Gesture);
+ mContentScrollArea->mIsMoving = true;
+ result = mContentScrollArea->eventFilter(NULL, &gestureEvent);
+ QVERIFY(result); //true
+
+ //3)
+ QSwipeGesture *swipeGesture = new QSwipeGesture();
+ QList<QGesture*> list;
+ list.append(swipeGesture);
+ QGestureEvent *gesture = new QGestureEvent(list);
+ QEvent *swipeGestureEvent = static_cast <QEvent*> (gesture);
+
+ mContentScrollArea->mIsMoving = false;
+ result = mContentScrollArea->eventFilter(NULL, swipeGestureEvent);
+ QVERIFY(result); //true
+
+ delete gesture;
+}
+
+/*!
+ Test function for event
+ 1. Test event type: Gesture, scroll area not moving
+ 2. Test event type: Gesture, scroll area is moving
+ 3. Test event type: FocusOut, scroll area not moving
+ 4. Test event type: FocusOut, scroll area is moving
+ 5. Test event type: FocusIn, scroll area not moving
+ 6. Test event type: FocusIn, scroll area is moving
+ 7. Test event type: LayoutRequest
+ */
+void TestCalenDayContentScrollArea::testEvent()
+{
+ bool result = false;
+
+ //1)
+ QEvent gestureEvent(QEvent::Gesture);
+ mContentScrollArea->mIsMoving = false;
+ result = mContentScrollArea->event(&gestureEvent);
+ QVERIFY(!result); //false
+
+ //2)
+ mContentScrollArea->mIsMoving = true;
+ result = mContentScrollArea->event(&gestureEvent);
+ QVERIFY(result); //true
+
+ //3)
+ QEvent focusOutEvent(QEvent::FocusOut);
+ mContentScrollArea->mIsMoving = false;
+ result = mContentScrollArea->event(&focusOutEvent);
+ QVERIFY(!result); //false
+
+ //4)
+ mContentScrollArea->mIsMoving = true;
+ result = mContentScrollArea->event(&focusOutEvent);
+ QVERIFY(result); //true
+
+ //5)
+ QEvent focusInEvent(QEvent::FocusIn);
+ mContentScrollArea->mIsMoving = false;
+ result = mContentScrollArea->event(&focusInEvent);
+ QVERIFY(!result); //false
+
+ //6)
+ mContentScrollArea->mIsMoving = true;
+ result = mContentScrollArea->event(&focusInEvent);
+ QVERIFY(result); //true
+
+ //7)
+ QEvent layoutReqEvent(QEvent::LayoutRequest);
+ QPointF oldPos = mContentScrollArea->contentWidget()->pos();
+ mContentScrollArea->event(&layoutReqEvent);
+ QPointF pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(oldPos == pos, false);
+}
+
+/*!
+ Test function for moveTo
+ 1. Test moveTo, day not changed
+ 2. Test moveTo, day changed to next
+ 3. Test moveTo, day changed to prev
+ */
+void TestCalenDayContentScrollArea::testMoveTo()
+{
+#ifndef __WINSCW__
+ //1)
+ mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange;
+ QPointF newPos(10,0);
+ mContentScrollArea->moveTo(newPos);
+ QPointF pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(mContentScrollArea->contentWidget()->pos().x()));
+ QCOMPARE(abs(pos.y()), abs(mContentScrollArea->contentWidget()->pos().y()));
+
+ //2)
+ newPos = QPointF(20,0);
+ mContentScrollArea->mMoveDirection = ECalenScrollToNext;
+ mContentScrollArea->moveTo(newPos);
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(pos.x()), abs(mContentScrollArea->contentWidget()->pos().x()));
+ QCOMPARE(abs(pos.y()), abs(mContentScrollArea->contentWidget()->pos().y()));
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ //2)
+ newPos = QPointF(-20,0);
+ mContentScrollArea->mMoveDirection = ECalenScrollToNext;
+ mContentScrollArea->moveTo(newPos);
+ pos = mContentScrollArea->contentWidget()->pos();
+ QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().x()), abs(pos.x()));
+ QCOMPARE(abs(mContentScrollArea->contentWidget()->pos().y()), abs(pos.y()));
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+#endif /* __WINSCW__ */
+}
+
+/*!
+ Test function for checking if swipe is horizontal or not
+ 1) test Horizontal swipe
+ 2) test no horizontal swipe
+ */
+void TestCalenDayContentScrollArea::testHorizontalSwipe()
+{
+#ifndef __WINSCW__
+ //1)
+ QCOMPARE(mContentScrollArea->isHorizontalSwipe(KCalenSwipeAngle - 5), true);
+
+ //2)
+ QCOMPARE(mContentScrollArea->isHorizontalSwipe(KCalenSwipeAngle + 5), false);
+#endif /* __WINSCW__ */
+}
+
+/*!
+ Test moveFinished slot
+ 1) test moveFinished, no day change
+ 2) test moveFinished, day changed to next
+ 3) test moveFinished, day changed to prev
+ */
+void TestCalenDayContentScrollArea::testMoveFinished()
+{
+#ifndef __WINSCW__
+ //1)
+ mContentScrollArea->mMoveDirection = ECalenScrollNoDayChange;
+ mContentScrollArea->moveFinished();
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ //2)
+ mContentScrollArea->mMoveDirection = ECalenScrollToNext;
+ mContentScrollArea->moveFinished();
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+
+ //3)
+ mContentScrollArea->mMoveDirection = ECalenScrollToPrev;
+ mContentScrollArea->moveFinished();
+ QCOMPARE(mContentScrollArea->mMoveDirection, ECalenScrollNoDayChange);
+#endif /* __WINSCW__ */
+}
+
+/*!
+ Test orientationChanged slot
+ 1) test orientation changed to horizontal
+ 2) test orientation changed to vertical
+ */
+void TestCalenDayContentScrollArea::testOrientationChanged()
+{
+#ifndef __WINSCW__
+ //1)
+ mContentScrollArea->orientationChanged(Qt::Horizontal);
+ QCOMPARE(mContentScrollArea->mOrientation, Qt::Horizontal);
+
+ //2)
+ mContentScrollArea->orientationChanged(Qt::Vertical);
+ QCOMPARE(mContentScrollArea->mOrientation, Qt::Vertical);
+#endif /* __WINSCW__ */
+}
+
+QTEST_MAIN(TestCalenDayContentScrollArea);
+#include "unittest_calendaycontentscrollarea.moc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaycontentscrollarea/unittest_calendaycontentscrollarea.pro Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,65 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: calendaycontentscrollarea test project file
+#
+
+TEMPLATE = app
+TARGET = unittest_calendaycontentscrollarea
+
+DEFINES += CALENVIEWS_DLL
+
+MOC_DIR = moc
+
+CONFIG += qtestlib
+CONFIG += symbian_test
+CONFIG += hb
+
+INCLUDEPATH += . \
+ ../../../inc/ \
+ ./../../../../inc/ \
+ ./../../../../../inc/
+
+DEPENDPATH += . \
+ ../../../inc/ \
+ ../../../src/ \
+ ./../../../../inc/ \
+ ./../../../../../inc/
+
+# Input
+HEADERS += calendaycontentscrollarea.h \
+ calendayutils.h \
+ hbinstance.h \
+ hbmainwindow.h \
+ hbswipegesture.h
+
+SOURCES += unittest_calendaycontentscrollarea.cpp \
+ calendaycontentscrollarea.cpp \
+ calendayutils.cpp
+
+RESOURCES += ../../../resources/calendaywidgets.qrc
+
+symbian : {
+ TARGET.CAPABILITY = CAP_APPLICATION
+ MMP_RULES += "USERINCLUDE ."
+
+ BLD_INF_RULES.prj_testexports += \
+ "./rom/unittest_calendaycontentscrollarea.iby CORE_APP_LAYER_IBY_EXPORT_PATH(unittest_calendaycontentscrollarea.iby)"
+
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+ LIBS += -lagendainterface \
+ -lcalencommonutils
+}
+
+# End of file --Don't remove this.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/HbInstance Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbinstance.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/calendayitemtest.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,80 @@
+/* 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: Test class for CalenDayItem
+ *
+ */
+
+#ifndef CALENDAYITEMTEST_H
+#define CALENDAYITEMTEST_H
+
+// System includes
+#include <HbFrameItem>
+#include <HbTextItem>
+#include <HbStyle>
+#include <HbColorScheme>
+#include <agendaentry.h>
+#include <hbabstractviewitem.h>
+
+// User includes
+#include "calendaycommonheaders.h"
+#include "calendayitem.h"
+#include "calendaystatusstrip.h"
+#include "calendaymodel.h"
+#include "calendayutils.h"
+#include "calenagendautils.h"
+#include "calendaycontainer.h"
+
+#ifndef __WINSCW__
+#define private public
+#define protected public
+#endif
+
+#include "calendayitem.h"
+
+class CalenDayItemTest : public CalenDayItem
+{
+public:
+ CalenDayItemTest::CalenDayItemTest(const CalenDayContainer *container) :
+ CalenDayItem(container)
+ {
+#ifndef __WINSCW__
+ mBg = new HbFrameItem("qtg_fr_cal_meeting_bg", HbFrameDrawer::NinePieces,
+ this);
+ mEventDesc = new HbTextItem(this);
+ // TODO: probably ElideLeft needed for mirrored layout
+ mEventDesc->setElideMode(Qt::ElideRight);
+ mEventDesc->setTextWrapping(Hb::TextWrapAnywhere);
+ mColorStripe = new CalenDayStatusStrip(this);
+
+ HbStyle::setItemName(mBg, QLatin1String("backgroundFrame"));
+ HbStyle::setItemName(mEventDesc, QLatin1String("eventDescription"));
+ HbStyle::setItemName(static_cast<QGraphicsItem *> (mColorStripe),
+ QLatin1String("colorStripe"));
+
+ HbDeviceProfile deviceProfile;
+ qreal stripeWidth = KCalenTimeStripWidth * deviceProfile.unitValue();
+ mColorStripe->setPreferredWidth(stripeWidth);
+
+ // Minimum size of event frame (without/with description)
+ mFrameMinWidth = KCalenMinEventWidth * deviceProfile.unitValue();
+ mEventDescMinWidth = KCalenMinTouchableEventWidth
+ * deviceProfile.unitValue();
+
+ // Minimum width is assured by widgetml and css, additionally called here
+ // to prevent minimum size hint caching inside effectiveSizeHint
+ setMinimumWidth(stripeWidth);
+#endif
+ }
+};
+
+#endif
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -23,10 +23,28 @@
#include "agendaentry.h"
#include "calendaycontainer.h"
+// System includes
+#include <HbFrameItem>
+#include <HbTextItem>
+#include <HbStyle>
+#include <HbColorScheme>
+#include <agendaentry.h>
+
+// User includes
+#include "calendaycommonheaders.h"
+#include "calendaystatusstrip.h"
+#include "calendaymodel.h"
+#include "calendayutils.h"
+#include "calenagendautils.h"
+#include "calendaycontainer.h"
+
+#ifndef __WINSCW__
#define private public
#define protected public
+#endif
#include "calendayitem.h"
+#include "calendayitemtest.h"
QRectF gTestWindowRect;
@@ -53,15 +71,14 @@
void testConstructors();
private:
- CalenDayItem *mItem;
+ CalenDayItemTest *mItem;
CalenDayContainer *mContainer;
};
/*!
Constructor
*/
-TestCalenDayItem::TestCalenDayItem() :
- mItem(NULL), mContainer(NULL)
+TestCalenDayItem::TestCalenDayItem() : mItem(NULL), mContainer(NULL)
{
}
@@ -95,10 +112,11 @@
void TestCalenDayItem::init()
{
mContainer = new CalenDayContainer();
- mItem = new CalenDayItem(mContainer);
-
+ mItem = new CalenDayItemTest(mContainer);
+#ifndef __WINSCW__
mItem->mBg = new HbFrameItem();
mItem->mEventDesc = new HbTextItem(0);
+#endif
}
/*!
@@ -125,11 +143,11 @@
void TestCalenDayItem::testConstructors()
{
//1)
- CalenDayItem *testItem = 0;
+ CalenDayItemTest *testItem = 0;
QVERIFY(!testItem);
//2)
- testItem = new CalenDayItem(mContainer);
+ testItem = new CalenDayItemTest(mContainer);
QVERIFY(testItem);
delete testItem;
}
@@ -140,59 +158,61 @@
2. Test if is the same as orginal.
*/
void TestCalenDayItem::testCreateItem()
- {
- HbAbstractViewItem *testItem = mItem->createItem();
- QVERIFY(testItem);
- delete testItem;
- }
+{
+ HbAbstractViewItem *testItem = mItem->createItem();
+ QVERIFY(testItem);
+ delete testItem;
+}
void TestCalenDayItem::testUpdateChildItems()
- {
-
- }
+{
+
+}
void TestCalenDayItem::testHasEventDescription()
- {
- QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
- qreal width = mItem->rect().width();
-
- qDebug() << "inited";
-
- mItem->mEventDescMinWidth = width - 4;
-
- qDebug() << "before resize";
-
- mItem->resizeEvent(event);
-
- qDebug() << "resize called";
-
- QVERIFY(mItem->hasEventDescription() == true);
-
-
- mItem->mEventDescMinWidth = width + 8;
- mItem->resizeEvent(event);
-
- qDebug() << "resize 2 called";
-
- QVERIFY(mItem->hasEventDescription() == false);
- }
+{
+#ifndef __WINSCW__
+ QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
+ qreal width = mItem->rect().width();
+
+ qDebug() << "inited";
+
+ mItem->mEventDescMinWidth = width - 4;
+
+ qDebug() << "before resize";
+
+ mItem->resizeEvent(event);
+
+ qDebug() << "resize called";
+
+ QVERIFY(mItem->hasEventDescription() == true);
+
+ mItem->mEventDescMinWidth = width + 8;
+ mItem->resizeEvent(event);
+
+ qDebug() << "resize 2 called";
+
+ QVERIFY(mItem->hasEventDescription() == false);
+#endif
+}
void TestCalenDayItem::testHasBackgroundFrame()
- {
- QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
- qreal width = mItem->rect().width();
+{
+#ifndef __WINSCW__
+ QGraphicsSceneResizeEvent *event = new QGraphicsSceneResizeEvent();
+ qreal width = mItem->rect().width();
+ mItem->mFrameMinWidth = width - 4;
+ mItem->resizeEvent(event);
- mItem->mFrameMinWidth = width - 4;
- mItem->resizeEvent(event);
-
- QVERIFY(mItem->hasBackgroundFrame() == true);
-
- mItem->mFrameMinWidth = width + 8;
- mItem->resizeEvent(event);
-
- QVERIFY(mItem->hasBackgroundFrame() == false);
- }
+ QVERIFY(mItem->hasBackgroundFrame() == true);
+
+ mItem->mFrameMinWidth = width + 8;
+ mItem->resizeEvent(event);
+
+ QVERIFY(mItem->hasBackgroundFrame() == false);
+#endif
+}
QTEST_MAIN(TestCalenDayItem);
#include "unittest_calendayitem.moc"
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitem/unittest_calendayitem.pro Fri Sep 17 08:29:05 2010 +0300
@@ -35,7 +35,8 @@
./../../../../../inc/
# Input
-HEADERS += calendayitem.h \
+HEADERS += calendayitemtest.h \
+ calendayitem.h \
calendaystatusstrip.h \
calendaycontainer.h \
calendayutils.h \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayitemview/HbInstance Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbinstance.h"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/calendayutils.h Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,46 @@
+/*!
+ Mocked class CalenDayUtils
+ */
+/*
+ * 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: CalenDayUtils utility class header.
+ *
+ */
+
+#ifndef CALENDAYUTILS_H_
+#define CALENDAYUTILS_H_
+
+class CalenDayUtils
+{
+public:
+ static CalenDayUtils *instance()
+ {
+ return new CalenDayUtils();
+ }
+ ~CalenDayUtils()
+ {
+ }
+
+ qreal hourElementHeight()
+ {
+ return 30;
+ }
+
+protected:
+ CalenDayUtils()
+ {
+ }
+};
+
+#endif /* CALENDAYUTILS_H_ */
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -242,26 +242,51 @@
QTest::addColumn<QTime>("testStartValue");
QTest::addColumn<QTime>("testEndValue");
- QTest::newRow("Full time start and end") << QTime(10,00,00)
- << QTime(11,00,00)
- << QTime(10,00,00)
- << QTime(11,00,00);
- QTest::newRow("Exactly 30min time start and end") << QTime(10,30,00)
- << QTime(11,30,00)
- << QTime(10,30,00)
- << QTime(11,30,00);
- QTest::newRow("More than 30min time start and end") << QTime(10,40,00)
- << QTime(12,35,00)
- << QTime(10,30,00)
- << QTime(13,00,00);
- QTest::newRow("time start > 30m and end > 23h30m") << QTime(20,35,00)
- << QTime(23,35,00)
- << QTime(20,30,00)
- << QTime(23,59,00);
- QTest::newRow("time start < 30m and end > 23h00m") << QTime(11,19,00)
- << QTime(23,10,00)
- << QTime(11,00,00)
- << QTime(23,30,00);
+ QTest::newRow("Full time start and end")
+ << QTime(10,00,00)
+ << QTime(11,00,00)
+ << QTime(10,00,00)
+ << QTime(11,00,00);
+ QTest::newRow("Exactly 15m time start and end")
+ << QTime(10, 15, 00)
+ << QTime(11, 15, 00)
+ << QTime(10, 15, 00)
+ << QTime(11, 15, 00);
+ QTest::newRow("More than 15m, less than 30m time start and end")
+ << QTime(10,18,00)
+ << QTime(10,24,00)
+ << QTime(10,15,00)
+ << QTime(10,30,00);
+ QTest::newRow("Exactly 30m time start and end")
+ << QTime(9, 30, 00)
+ << QTime(10, 30, 00)
+ << QTime(9, 30, 00)
+ << QTime(10, 30, 00);
+ QTest::newRow("More than 30m, less than 45m time start and end")
+ << QTime(10,32,00)
+ << QTime(10,43,00)
+ << QTime(10,30,00)
+ << QTime(10,45,00);
+ QTest::newRow("Exactly 45m time start and end")
+ << QTime(9, 45, 00)
+ << QTime(10, 45, 00)
+ << QTime(9, 45, 00)
+ << QTime(10, 45, 00);
+ QTest::newRow("More than 45m, less than 60m time start and end")
+ << QTime(10,48,00)
+ << QTime(10,57,00)
+ << QTime(10,45,00)
+ << QTime(11,00,00);
+ QTest::newRow("time start > 45m and end > 23h45m")
+ << QTime(20,47,00)
+ << QTime(23,55,00)
+ << QTime(20,45,00)
+ << QTime(23,59,00);
+ QTest::newRow("time start < 30m and (23h30m < end < 23h45m")
+ << QTime(11,19,00)
+ << QTime(23,38,00)
+ << QTime(11,15,00)
+ << QTime(23,45,00);
}
/*!
@@ -279,7 +304,7 @@
//run function
QPair<QTime,QTime> testStartEndValue
= mStatusStrip->calculateStartEndPostion(testedStartValue,
- testedEndValue);
+ testedEndValue);
//check data
QCOMPARE(testStartEndValue.first,testStartValue);
QCOMPARE(testStartEndValue.second,testEndValue);
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendaystatusstrip/unittest_calendaystatusstrip.pro Fri Sep 17 08:29:05 2010 +0300
@@ -36,7 +36,8 @@
# Input
HEADERS += calendaystatusstrip.h \
- calendaystatusstriptest.h
+ calendaystatusstriptest.h \
+ calendayutils.h
SOURCES += unittest_calendaystatusstrip.cpp \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbInstance Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbinstance.h"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/HbStyle Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+#include "hbstyle.h"
\ No newline at end of file
--- a/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittest_calendayutils/unittest_calendayutils.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -129,7 +129,7 @@
{
qreal hEH = mUtils->hourElementHeight();
- qreal myHeight = mUnit * 3 + param_value * 4;
+ qreal myHeight = mUnit* 4.1 + param_value * 2 + param_value * 2;
QCOMPARE(hEH, myHeight);
}
--- a/calendarui/views/dayview/tsrc/unittests/unittests.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/dayview/tsrc/unittests/unittests.pro Fri Sep 17 08:29:05 2010 +0300
@@ -28,7 +28,8 @@
unittest_calendaymodel \
unittest_calendayitemview \
unittest_calendaymodelmanager \
- unittest_calendayview
+ unittest_calendayview \
+ unittest_calendaycontentscrollarea
CONFIG += symbian_test
--- a/calendarui/views/eabi/calenviewsu.def Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/eabi/calenviewsu.def Fri Sep 17 08:29:05 2010 +0300
@@ -18,254 +18,253 @@
_ZN14CalenMonthGrid15getCurrentIndexEv @ 17 NONAME
_ZN14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 18 NONAME
_ZN14CalenMonthGrid16staticMetaObjectE @ 19 NONAME DATA 16
- _ZN14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 20 NONAME
- _ZN14CalenMonthGrid17scrollingFinishedEv @ 21 NONAME
- _ZN14CalenMonthGrid18orientationChangedEN2Qt11OrientationE @ 22 NONAME
- _ZN14CalenMonthGrid19getStaticMetaObjectEv @ 23 NONAME
- _ZN14CalenMonthGrid19handleAppendingRowsER5QListI14CalenMonthDataE @ 24 NONAME
- _ZN14CalenMonthGrid19setFocusToProperDayEv @ 25 NONAME
- _ZN14CalenMonthGrid20handlePrependingRowsER5QListI14CalenMonthDataE @ 26 NONAME
- _ZN14CalenMonthGrid20updateMonthGridModelER5QListI14CalenMonthDataEib @ 27 NONAME
- _ZN14CalenMonthGrid24handlePanGestureFinishedEv @ 28 NONAME
- _ZN14CalenMonthGrid33updateMonthGridWithInActiveMonthsER5QListI14CalenMonthDataE @ 29 NONAME
- _ZN14CalenMonthGrid34updateMonthGridWithEventIndicatorsER5QListI14CalenMonthDataE @ 30 NONAME
- _ZN14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 31 NONAME
- _ZN14CalenMonthGrid7setViewEP14CalenMonthView @ 32 NONAME
- _ZN14CalenMonthGrid9upGestureEv @ 33 NONAME
- _ZN14CalenMonthGridC1EP13QGraphicsItem @ 34 NONAME
- _ZN14CalenMonthGridC2EP13QGraphicsItem @ 35 NONAME
- _ZN14CalenMonthGridD0Ev @ 36 NONAME
- _ZN14CalenMonthGridD1Ev @ 37 NONAME
- _ZN14CalenMonthGridD2Ev @ 38 NONAME
- _ZN14CalenMonthView10createGridEv @ 39 NONAME
- _ZN14CalenMonthView11qt_metacallEN11QMetaObject4CallEiPPv @ 40 NONAME
- _ZN14CalenMonthView11qt_metacastEPKc @ 41 NONAME
- _ZN14CalenMonthView12createEditorEv @ 42 NONAME
- _ZN14CalenMonthView12doPopulationEv @ 43 NONAME
- _ZN14CalenMonthView12getActiveDayEv @ 44 NONAME
- _ZN14CalenMonthView12setActiveDayE9QDateTime @ 45 NONAME
- _ZN14CalenMonthView13doLazyLoadingEv @ 46 NONAME
- _ZN14CalenMonthView13getCurrentDayEv @ 47 NONAME
- _ZN14CalenMonthView13launchDayViewEv @ 48 NONAME
- _ZN14CalenMonthView13monthDataListEv @ 49 NONAME
- _ZN14CalenMonthView14addWeekNumbersEv @ 50 NONAME
- _ZN14CalenMonthView14firstDayOfGridEv @ 51 NONAME
- _ZN14CalenMonthView14rowsInFutMonthEv @ 52 NONAME
- _ZN14CalenMonthView14setDateToLabelEv @ 53 NONAME
- _ZN14CalenMonthView14updateDayLabelEv @ 54 NONAME
- _ZN14CalenMonthView15dateFromContextERK13MCalenContext @ 55 NONAME
- _ZN14CalenMonthView15getInstanceListER5QListI5QDateE9QDateTimeS4_ @ 56 NONAME
- _ZN14CalenMonthView15onLocaleChangedEi @ 57 NONAME
- _ZN14CalenMonthView15rowsInPrevMonthEv @ 58 NONAME
- _ZN14CalenMonthView16getCurrGridIndexEv @ 59 NONAME
- _ZN14CalenMonthView16onContextChangedEv @ 60 NONAME
- _ZN14CalenMonthView16setCurrGridIndexEi @ 61 NONAME
- _ZN14CalenMonthView16staticMetaObjectE @ 62 NONAME DATA 16
- _ZN14CalenMonthView17changeOrientationEN2Qt11OrientationE @ 63 NONAME
- _ZN14CalenMonthView17populateNextMonthEv @ 64 NONAME
- _ZN14CalenMonthView17populatePrevMonthEv @ 65 NONAME
- _ZN14CalenMonthView17removeWeekNumbersEv @ 66 NONAME
- _ZN14CalenMonthView18addBackgroundFrameEv @ 67 NONAME
- _ZN14CalenMonthView18completePopulationEv @ 68 NONAME
- _ZN14CalenMonthView19getStaticMetaObjectEv @ 69 NONAME
- _ZN14CalenMonthView19populatePreviewPaneER9QDateTime @ 70 NONAME
- _ZN14CalenMonthView20prepareForPopulationEv @ 71 NONAME
- _ZN14CalenMonthView21refreshViewOnGoToDateEv @ 72 NONAME
- _ZN14CalenMonthView22addRemoveActionsInMenuEv @ 73 NONAME
- _ZN14CalenMonthView22setContextForActiveDayEi @ 74 NONAME
- _ZN14CalenMonthView22updateWeekNumGridModelEv @ 75 NONAME
- _ZN14CalenMonthView23handleChangeOrientationEv @ 76 NONAME
- _ZN14CalenMonthView23handleGridItemActivatedEv @ 77 NONAME
- _ZN14CalenMonthView24handlePreviewPaneGestureEb @ 78 NONAME
- _ZN14CalenMonthView24populateWithInstanceViewEv @ 79 NONAME
- _ZN14CalenMonthView24updateModelWithPrevMonthEv @ 80 NONAME
- _ZN14CalenMonthView25handleLeftEffectCompletedERKN8HbEffect12EffectStatusE @ 81 NONAME
- _ZN14CalenMonthView26fetchEntriesAndUpdateModelEv @ 82 NONAME
- _ZN14CalenMonthView26handleRightEffectCompletedERKN8HbEffect12EffectStatusE @ 83 NONAME
- _ZN14CalenMonthView26updateModelWithFutureMonthEv @ 84 NONAME
- _ZN14CalenMonthView27showHideRegionalInformationEv @ 85 NONAME
- _ZN14CalenMonthView35updateMonthDataArrayWithActiveDatesEv @ 86 NONAME
- _ZN14CalenMonthView7setDateEv @ 87 NONAME
- _ZN14CalenMonthView9goToTodayEv @ 88 NONAME
- _ZN14CalenMonthView9setupViewEP14CalenDocLoader @ 89 NONAME
- _ZN14CalenMonthViewC1ER14MCalenServices @ 90 NONAME
- _ZN14CalenMonthViewC2ER14MCalenServices @ 91 NONAME
- _ZN14CalenMonthViewD0Ev @ 92 NONAME
- _ZN14CalenMonthViewD1Ev @ 93 NONAME
- _ZN14CalenMonthViewD2Ev @ 94 NONAME
- _ZN15CalenAgendaView12doPopulationEv @ 95 NONAME
- _ZN15CalenAgendaView14clearListModelEv @ 96 NONAME
- _ZN15CalenAgendaView18HandleNotificationE18TCalenNotification @ 97 NONAME
- _ZN15CalenAgendaView26disconnectAboutToQuitEventEv @ 98 NONAME
- _ZN15CalenAgendaView9docLoaderEv @ 99 NONAME
- _ZN15CalenAgendaView9setupViewEP14CalenDocLoader @ 100 NONAME
- _ZN15CalenAgendaViewC1ER14MCalenServices @ 101 NONAME
- _ZN15CalenAgendaViewC2ER14MCalenServices @ 102 NONAME
- _ZN15CalenAgendaViewD0Ev @ 103 NONAME
- _ZN15CalenAgendaViewD1Ev @ 104 NONAME
- _ZN15CalenAgendaViewD2Ev @ 105 NONAME
- _ZN15CalenNativeView17captureScreenshotEb @ 106 NONAME
- _ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 107 NONAME
- _ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 108 NONAME
- _ZN16CalenPluginLabelD0Ev @ 109 NONAME
- _ZN16CalenPluginLabelD1Ev @ 110 NONAME
- _ZN16CalenPluginLabelD2Ev @ 111 NONAME
- _ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 112 NONAME
- _ZN16CalenPreviewPane11qt_metacastEPKc @ 113 NONAME
- _ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 114 NONAME
- _ZN16CalenPreviewPane13populateLabelE9QDateTime @ 115 NONAME
- _ZN16CalenPreviewPane13stopScrollingEv @ 116 NONAME
- _ZN16CalenPreviewPane15startAutoScrollEv @ 117 NONAME
- _ZN16CalenPreviewPane16GetInstanceListLEv @ 118 NONAME
- _ZN16CalenPreviewPane16staticMetaObjectE @ 119 NONAME DATA 16
- _ZN16CalenPreviewPane17scrollingFinishedEv @ 120 NONAME
- _ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 121 NONAME
- _ZN16CalenPreviewPane19getStaticMetaObjectEv @ 122 NONAME
- _ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 123 NONAME
- _ZN16CalenPreviewPane21checkStartTimeOfEventER9QDateTime @ 124 NONAME
- _ZN16CalenPreviewPane4DateEv @ 125 NONAME
- _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 126 NONAME
- _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 127 NONAME
- _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 128 NONAME
- _ZN16CalenPreviewPaneD0Ev @ 129 NONAME
- _ZN16CalenPreviewPaneD1Ev @ 130 NONAME
- _ZN16CalenPreviewPaneD2Ev @ 131 NONAME
- _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 132 NONAME
- _ZN17CalenSettingsView11qt_metacastEPKc @ 133 NONAME
- _ZN17CalenSettingsView11refreshViewEv @ 134 NONAME
- _ZN17CalenSettingsView14initializeFormEv @ 135 NONAME
- _ZN17CalenSettingsView16staticMetaObjectE @ 136 NONAME DATA 16
- _ZN17CalenSettingsView18launchPreviousViewEv @ 137 NONAME
- _ZN17CalenSettingsView19getStaticMetaObjectEv @ 138 NONAME
- _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 139 NONAME
- _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 140 NONAME
- _ZN17CalenSettingsViewD0Ev @ 141 NONAME
- _ZN17CalenSettingsViewD1Ev @ 142 NONAME
- _ZN17CalenSettingsViewD2Ev @ 143 NONAME
- _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 144 NONAME
- _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 145 NONAME
- _ZN21CalenAgendaViewWidgetD0Ev @ 146 NONAME
- _ZN21CalenAgendaViewWidgetD1Ev @ 147 NONAME
- _ZN21CalenAgendaViewWidgetD2Ev @ 148 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 149 NONAME
- _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 150 NONAME
- _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 151 NONAME DATA 16
- _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 152 NONAME
- _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 153 NONAME
- _ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 154 NONAME
- _ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 155 NONAME
- _ZN21CalenThickLinesDrawerD0Ev @ 156 NONAME
- _ZN21CalenThickLinesDrawerD1Ev @ 157 NONAME
- _ZN21CalenThickLinesDrawerD2Ev @ 158 NONAME
- _ZNK14CalenMonthGrid10metaObjectEv @ 159 NONAME
- _ZNK14CalenMonthView10metaObjectEv @ 160 NONAME
- _ZNK16CalenPreviewPane10metaObjectEv @ 161 NONAME
- _ZNK17CalenSettingsView10metaObjectEv @ 162 NONAME
- _ZNK21CalenThickLinesDrawer10metaObjectEv @ 163 NONAME
- _ZTI14CalenMonthGrid @ 164 NONAME
- _ZTI14CalenMonthView @ 165 NONAME
- _ZTI16CalenPreviewPane @ 166 NONAME
- _ZTI17CalenSettingsView @ 167 NONAME
- _ZTI21CalenThickLinesDrawer @ 168 NONAME
- _ZTV14CalenMonthGrid @ 169 NONAME
- _ZTV14CalenMonthView @ 170 NONAME
- _ZTV16CalenPreviewPane @ 171 NONAME
- _ZTV17CalenSettingsView @ 172 NONAME
- _ZTV21CalenThickLinesDrawer @ 173 NONAME
- _ZThn16_N12CalenDayViewD0Ev @ 174 NONAME
- _ZThn16_N12CalenDayViewD1Ev @ 175 NONAME
- _ZThn16_N14CalenMonthGridD0Ev @ 176 NONAME
- _ZThn16_N14CalenMonthGridD1Ev @ 177 NONAME
- _ZThn16_N14CalenMonthViewD0Ev @ 178 NONAME
- _ZThn16_N14CalenMonthViewD1Ev @ 179 NONAME
- _ZThn16_N15CalenAgendaViewD0Ev @ 180 NONAME
- _ZThn16_N15CalenAgendaViewD1Ev @ 181 NONAME
- _ZThn16_N16CalenPluginLabelD0Ev @ 182 NONAME
- _ZThn16_N16CalenPluginLabelD1Ev @ 183 NONAME
- _ZThn16_N16CalenPreviewPaneD0Ev @ 184 NONAME
- _ZThn16_N16CalenPreviewPaneD1Ev @ 185 NONAME
- _ZThn16_N17CalenSettingsViewD0Ev @ 186 NONAME
- _ZThn16_N17CalenSettingsViewD1Ev @ 187 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 188 NONAME
- _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 189 NONAME
- _ZThn16_N21CalenThickLinesDrawerD0Ev @ 190 NONAME
- _ZThn16_N21CalenThickLinesDrawerD1Ev @ 191 NONAME
- _ZThn28_N15CalenAgendaView18HandleNotificationE18TCalenNotification @ 192 NONAME
- _ZThn8_N12CalenDayViewD0Ev @ 193 NONAME
- _ZThn8_N12CalenDayViewD1Ev @ 194 NONAME
- _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 195 NONAME
- _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 196 NONAME
- _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 197 NONAME
- _ZThn8_N14CalenMonthGridD0Ev @ 198 NONAME
- _ZThn8_N14CalenMonthGridD1Ev @ 199 NONAME
- _ZThn8_N14CalenMonthViewD0Ev @ 200 NONAME
- _ZThn8_N14CalenMonthViewD1Ev @ 201 NONAME
- _ZThn8_N15CalenAgendaViewD0Ev @ 202 NONAME
- _ZThn8_N15CalenAgendaViewD1Ev @ 203 NONAME
- _ZThn8_N16CalenPluginLabelD0Ev @ 204 NONAME
- _ZThn8_N16CalenPluginLabelD1Ev @ 205 NONAME
- _ZThn8_N16CalenPreviewPaneD0Ev @ 206 NONAME
- _ZThn8_N16CalenPreviewPaneD1Ev @ 207 NONAME
- _ZThn8_N17CalenSettingsViewD0Ev @ 208 NONAME
- _ZThn8_N17CalenSettingsViewD1Ev @ 209 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 210 NONAME
- _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 211 NONAME
- _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 212 NONAME
- _ZThn8_N21CalenThickLinesDrawerD0Ev @ 213 NONAME
- _ZThn8_N21CalenThickLinesDrawerD1Ev @ 214 NONAME
- _ZN22CalenDayHourScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 215 NONAME
- _ZN22CalenDayHourScrollArea11qt_metacastEPKc @ 216 NONAME
- _ZN22CalenDayHourScrollArea11setDateTimeERK9QDateTime @ 217 NONAME
- _ZN22CalenDayHourScrollArea12scrollToHourEi @ 218 NONAME
- _ZN22CalenDayHourScrollArea16scrollVerticallyERK7QPointF @ 219 NONAME
- _ZN22CalenDayHourScrollArea16staticMetaObjectE @ 220 NONAME DATA 16
- _ZN22CalenDayHourScrollArea19getStaticMetaObjectEv @ 221 NONAME
- _ZN22CalenDayHourScrollAreaC1EP13QGraphicsItem @ 222 NONAME
- _ZN22CalenDayHourScrollAreaC2EP13QGraphicsItem @ 223 NONAME
- _ZN22CalenDayHourScrollAreaD0Ev @ 224 NONAME
- _ZN22CalenDayHourScrollAreaD1Ev @ 225 NONAME
- _ZN22CalenDayHourScrollAreaD2Ev @ 226 NONAME
- _ZN25CalenDayContentScrollArea11eventFilterEP7QObjectP6QEvent @ 227 NONAME
- _ZN25CalenDayContentScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 228 NONAME
- _ZN25CalenDayContentScrollArea11qt_metacastEPKc @ 229 NONAME
- _ZN25CalenDayContentScrollArea12gestureEventEP13QGestureEvent @ 230 NONAME
- _ZN25CalenDayContentScrollArea12moveFinishedEv @ 231 NONAME
- _ZN25CalenDayContentScrollArea14scrollByAmountERK7QPointF @ 232 NONAME
- _ZN25CalenDayContentScrollArea16staticMetaObjectE @ 233 NONAME DATA 16
- _ZN25CalenDayContentScrollArea17checkPanDirectionEP11QPanGesture @ 234 NONAME
- _ZN25CalenDayContentScrollArea18orientationChangedEN2Qt11OrientationE @ 235 NONAME
- _ZN25CalenDayContentScrollArea19getStaticMetaObjectEv @ 236 NONAME
- _ZN25CalenDayContentScrollArea20scrollToMiddleWidgetEv @ 237 NONAME
- _ZN25CalenDayContentScrollArea21scrollAreaMoveStartedE20CalenScrollDirection @ 238 NONAME
- _ZN25CalenDayContentScrollArea22scrollAreaMoveFinishedE20CalenScrollDirection @ 239 NONAME
- _ZN25CalenDayContentScrollArea5eventEP6QEvent @ 240 NONAME
- _ZN25CalenDayContentScrollArea6moveToERK7QPointFi @ 241 NONAME
- _ZN25CalenDayContentScrollAreaC1EP13QGraphicsItem @ 242 NONAME
- _ZN25CalenDayContentScrollAreaC2EP13QGraphicsItem @ 243 NONAME
- _ZN25CalenDayContentScrollAreaD0Ev @ 244 NONAME
- _ZN25CalenDayContentScrollAreaD1Ev @ 245 NONAME
- _ZN25CalenDayContentScrollAreaD2Ev @ 246 NONAME
- _ZNK22CalenDayHourScrollArea10metaObjectEv @ 247 NONAME
- _ZNK22CalenDayHourScrollArea8dateTimeEv @ 248 NONAME
- _ZNK25CalenDayContentScrollArea10metaObjectEv @ 249 NONAME
- _ZTI22CalenDayHourScrollArea @ 250 NONAME
- _ZTI25CalenDayContentScrollArea @ 251 NONAME
- _ZTV22CalenDayHourScrollArea @ 252 NONAME
- _ZTV25CalenDayContentScrollArea @ 253 NONAME
- _ZThn16_N22CalenDayHourScrollAreaD0Ev @ 254 NONAME
- _ZThn16_N22CalenDayHourScrollAreaD1Ev @ 255 NONAME
- _ZThn16_N25CalenDayContentScrollAreaD0Ev @ 256 NONAME
- _ZThn16_N25CalenDayContentScrollAreaD1Ev @ 257 NONAME
- _ZThn8_N22CalenDayHourScrollAreaD0Ev @ 258 NONAME
- _ZThn8_N22CalenDayHourScrollAreaD1Ev @ 259 NONAME
- _ZThn8_N25CalenDayContentScrollAreaD0Ev @ 260 NONAME
- _ZThn8_N25CalenDayContentScrollAreaD1Ev @ 261 NONAME
- _ZN14CalenMonthGrid17handleThemeChangeEv @ 262 NONAME
- _ZN14CalenMonthView17handleThemeChangeEv @ 263 NONAME
- _ZN16CalenPreviewPane13effectStartedEv @ 264 NONAME
- _ZN16CalenPreviewPane14effectFinishedEv @ 265 NONAME
- _ZN21CalenThickLinesDrawer17handleThemeChangeEv @ 266 NONAME
- _ZN16CalenPreviewPane17handleThemeChangeEv @ 267 NONAME
- _ZNK25CalenDayContentScrollArea17isHorizontalSwipeEf @ 268 NONAME
- _ZN14CalenMonthView26disconnectAboutToQuitEventEv @ 269 NONAME
+ _ZN14CalenMonthGrid17handleThemeChangeEv @ 20 NONAME
+ _ZN14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 21 NONAME
+ _ZN14CalenMonthGrid17scrollingFinishedEv @ 22 NONAME
+ _ZN14CalenMonthGrid18orientationChangedEN2Qt11OrientationE @ 23 NONAME
+ _ZN14CalenMonthGrid19getStaticMetaObjectEv @ 24 NONAME
+ _ZN14CalenMonthGrid19handleAppendingRowsER5QListI14CalenMonthDataE @ 25 NONAME
+ _ZN14CalenMonthGrid19setFocusToProperDayEv @ 26 NONAME
+ _ZN14CalenMonthGrid20handlePrependingRowsER5QListI14CalenMonthDataE @ 27 NONAME
+ _ZN14CalenMonthGrid20updateMonthGridModelER5QListI14CalenMonthDataEib @ 28 NONAME
+ _ZN14CalenMonthGrid24handlePanGestureFinishedEv @ 29 NONAME
+ _ZN14CalenMonthGrid33updateMonthGridWithInActiveMonthsER5QListI14CalenMonthDataE @ 30 NONAME
+ _ZN14CalenMonthGrid34updateMonthGridWithEventIndicatorsER5QListI14CalenMonthDataE @ 31 NONAME
+ _ZN14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 32 NONAME
+ _ZN14CalenMonthGrid7setViewEP14CalenMonthView @ 33 NONAME
+ _ZN14CalenMonthGrid9upGestureEv @ 34 NONAME
+ _ZN14CalenMonthGridC1EP13QGraphicsItem @ 35 NONAME
+ _ZN14CalenMonthGridC2EP13QGraphicsItem @ 36 NONAME
+ _ZN14CalenMonthGridD0Ev @ 37 NONAME
+ _ZN14CalenMonthGridD1Ev @ 38 NONAME
+ _ZN14CalenMonthGridD2Ev @ 39 NONAME
+ _ZN14CalenMonthView10createGridEv @ 40 NONAME
+ _ZN14CalenMonthView11qt_metacallEN11QMetaObject4CallEiPPv @ 41 NONAME
+ _ZN14CalenMonthView11qt_metacastEPKc @ 42 NONAME
+ _ZN14CalenMonthView12createEditorEv @ 43 NONAME
+ _ZN14CalenMonthView12doPopulationEv @ 44 NONAME
+ _ZN14CalenMonthView12getActiveDayEv @ 45 NONAME
+ _ZN14CalenMonthView12setActiveDayE9QDateTime @ 46 NONAME
+ _ZN14CalenMonthView13doLazyLoadingEv @ 47 NONAME
+ _ZN14CalenMonthView13getCurrentDayEv @ 48 NONAME
+ _ZN14CalenMonthView13launchDayViewEv @ 49 NONAME
+ _ZN14CalenMonthView13monthDataListEv @ 50 NONAME
+ _ZN14CalenMonthView14addWeekNumbersEv @ 51 NONAME
+ _ZN14CalenMonthView14firstDayOfGridEv @ 52 NONAME
+ _ZN14CalenMonthView14rowsInFutMonthEv @ 53 NONAME
+ _ZN14CalenMonthView14setDateToLabelEv @ 54 NONAME
+ _ZN14CalenMonthView14updateDayLabelEv @ 55 NONAME
+ _ZN14CalenMonthView15dateFromContextERK13MCalenContext @ 56 NONAME
+ _ZN14CalenMonthView15getInstanceListER5QListI5QDateE9QDateTimeS4_ @ 57 NONAME
+ _ZN14CalenMonthView15onLocaleChangedEi @ 58 NONAME
+ _ZN14CalenMonthView15rowsInPrevMonthEv @ 59 NONAME
+ _ZN14CalenMonthView16getCurrGridIndexEv @ 60 NONAME
+ _ZN14CalenMonthView16onContextChangedEv @ 61 NONAME
+ _ZN14CalenMonthView16setCurrGridIndexEi @ 62 NONAME
+ _ZN14CalenMonthView16staticMetaObjectE @ 63 NONAME DATA 16
+ _ZN14CalenMonthView17changeOrientationEN2Qt11OrientationE @ 64 NONAME
+ _ZN14CalenMonthView17handleThemeChangeEv @ 65 NONAME
+ _ZN14CalenMonthView17populateNextMonthEv @ 66 NONAME
+ _ZN14CalenMonthView17populatePrevMonthEv @ 67 NONAME
+ _ZN14CalenMonthView17removeWeekNumbersEv @ 68 NONAME
+ _ZN14CalenMonthView18addBackgroundFrameEv @ 69 NONAME
+ _ZN14CalenMonthView18completePopulationEv @ 70 NONAME
+ _ZN14CalenMonthView19getStaticMetaObjectEv @ 71 NONAME
+ _ZN14CalenMonthView19populatePreviewPaneER9QDateTime @ 72 NONAME
+ _ZN14CalenMonthView20prepareForPopulationEv @ 73 NONAME
+ _ZN14CalenMonthView21refreshViewOnGoToDateEv @ 74 NONAME
+ _ZN14CalenMonthView22addRemoveActionsInMenuEv @ 75 NONAME
+ _ZN14CalenMonthView22setContextForActiveDayEi @ 76 NONAME
+ _ZN14CalenMonthView22updateWeekNumGridModelEv @ 77 NONAME
+ _ZN14CalenMonthView23handleChangeOrientationEv @ 78 NONAME
+ _ZN14CalenMonthView23handleGridItemActivatedEv @ 79 NONAME
+ _ZN14CalenMonthView24handlePreviewPaneGestureEb @ 80 NONAME
+ _ZN14CalenMonthView24populateWithInstanceViewEv @ 81 NONAME
+ _ZN14CalenMonthView24updateModelWithPrevMonthEv @ 82 NONAME
+ _ZN14CalenMonthView25handleLeftEffectCompletedERKN8HbEffect12EffectStatusE @ 83 NONAME
+ _ZN14CalenMonthView26disconnectAboutToQuitEventEv @ 84 NONAME
+ _ZN14CalenMonthView26fetchEntriesAndUpdateModelEv @ 85 NONAME
+ _ZN14CalenMonthView26handleRightEffectCompletedERKN8HbEffect12EffectStatusE @ 86 NONAME
+ _ZN14CalenMonthView26updateModelWithFutureMonthEv @ 87 NONAME
+ _ZN14CalenMonthView27showHideRegionalInformationEv @ 88 NONAME
+ _ZN14CalenMonthView35updateMonthDataArrayWithActiveDatesEv @ 89 NONAME
+ _ZN14CalenMonthView7setDateEv @ 90 NONAME
+ _ZN14CalenMonthView9goToTodayEv @ 91 NONAME
+ _ZN14CalenMonthView9setupViewEP14CalenDocLoader @ 92 NONAME
+ _ZN14CalenMonthViewC1ER14MCalenServices @ 93 NONAME
+ _ZN14CalenMonthViewC2ER14MCalenServices @ 94 NONAME
+ _ZN14CalenMonthViewD0Ev @ 95 NONAME
+ _ZN14CalenMonthViewD1Ev @ 96 NONAME
+ _ZN14CalenMonthViewD2Ev @ 97 NONAME
+ _ZN15CalenAgendaView12doPopulationEv @ 98 NONAME
+ _ZN15CalenAgendaView14clearListModelEv @ 99 NONAME
+ _ZN15CalenAgendaView26disconnectAboutToQuitEventEv @ 100 NONAME
+ _ZN15CalenAgendaView9docLoaderEv @ 101 NONAME
+ _ZN15CalenAgendaView9setupViewEP14CalenDocLoader @ 102 NONAME
+ _ZN15CalenAgendaViewC1ER14MCalenServices @ 103 NONAME
+ _ZN15CalenAgendaViewC2ER14MCalenServices @ 104 NONAME
+ _ZN15CalenAgendaViewD0Ev @ 105 NONAME
+ _ZN15CalenAgendaViewD1Ev @ 106 NONAME
+ _ZN15CalenAgendaViewD2Ev @ 107 NONAME
+ _ZN15CalenNativeView17captureScreenshotEb @ 108 NONAME
+ _ZN16CalenPluginLabelC1ER14MCalenServicesP13QGraphicsItem @ 109 NONAME
+ _ZN16CalenPluginLabelC2ER14MCalenServicesP13QGraphicsItem @ 110 NONAME
+ _ZN16CalenPluginLabelD0Ev @ 111 NONAME
+ _ZN16CalenPluginLabelD1Ev @ 112 NONAME
+ _ZN16CalenPluginLabelD2Ev @ 113 NONAME
+ _ZN16CalenPreviewPane11qt_metacallEN11QMetaObject4CallEiPPv @ 114 NONAME
+ _ZN16CalenPreviewPane11qt_metacastEPKc @ 115 NONAME
+ _ZN16CalenPreviewPane12gestureEventEP13QGestureEvent @ 116 NONAME
+ _ZN16CalenPreviewPane12tapTriggeredEv @ 117 NONAME
+ _ZN16CalenPreviewPane13effectStartedEv @ 118 NONAME
+ _ZN16CalenPreviewPane13populateLabelE9QDateTime @ 119 NONAME
+ _ZN16CalenPreviewPane13stopScrollingEv @ 120 NONAME
+ _ZN16CalenPreviewPane14effectFinishedEv @ 121 NONAME
+ _ZN16CalenPreviewPane15startAutoScrollEv @ 122 NONAME
+ _ZN16CalenPreviewPane16GetInstanceListLEv @ 123 NONAME
+ _ZN16CalenPreviewPane16staticMetaObjectE @ 124 NONAME DATA 16
+ _ZN16CalenPreviewPane17handleThemeChangeEv @ 125 NONAME
+ _ZN16CalenPreviewPane17scrollingFinishedEv @ 126 NONAME
+ _ZN16CalenPreviewPane17setNoEntriesLabelEP7HbLabel @ 127 NONAME
+ _ZN16CalenPreviewPane19getStaticMetaObjectEv @ 128 NONAME
+ _ZN16CalenPreviewPane19onTwoSecondsTimeoutEv @ 129 NONAME
+ _ZN16CalenPreviewPane21checkStartTimeOfEventER9QDateTime @ 130 NONAME
+ _ZN16CalenPreviewPane4DateEv @ 131 NONAME
+ _ZN16CalenPreviewPane7setViewEP14CalenMonthView @ 132 NONAME
+ _ZN16CalenPreviewPaneC1ER14MCalenServicesP13QGraphicsItem @ 133 NONAME
+ _ZN16CalenPreviewPaneC2ER14MCalenServicesP13QGraphicsItem @ 134 NONAME
+ _ZN16CalenPreviewPaneD0Ev @ 135 NONAME
+ _ZN16CalenPreviewPaneD1Ev @ 136 NONAME
+ _ZN16CalenPreviewPaneD2Ev @ 137 NONAME
+ _ZN17CalenSettingsView11qt_metacallEN11QMetaObject4CallEiPPv @ 138 NONAME
+ _ZN17CalenSettingsView11qt_metacastEPKc @ 139 NONAME
+ _ZN17CalenSettingsView11refreshViewEv @ 140 NONAME
+ _ZN17CalenSettingsView14initializeFormEv @ 141 NONAME
+ _ZN17CalenSettingsView16staticMetaObjectE @ 142 NONAME DATA 16
+ _ZN17CalenSettingsView18launchPreviousViewEv @ 143 NONAME
+ _ZN17CalenSettingsView19getStaticMetaObjectEv @ 144 NONAME
+ _ZN17CalenSettingsViewC1ER14MCalenServicesP13QGraphicsItem @ 145 NONAME
+ _ZN17CalenSettingsViewC2ER14MCalenServicesP13QGraphicsItem @ 146 NONAME
+ _ZN17CalenSettingsViewD0Ev @ 147 NONAME
+ _ZN17CalenSettingsViewD1Ev @ 148 NONAME
+ _ZN17CalenSettingsViewD2Ev @ 149 NONAME
+ _ZN21CalenAgendaViewWidgetC1ER14MCalenServicesP14CalenDocLoader @ 150 NONAME
+ _ZN21CalenAgendaViewWidgetC2ER14MCalenServicesP14CalenDocLoader @ 151 NONAME
+ _ZN21CalenAgendaViewWidgetD0Ev @ 152 NONAME
+ _ZN21CalenAgendaViewWidgetD1Ev @ 153 NONAME
+ _ZN21CalenAgendaViewWidgetD2Ev @ 154 NONAME
+ _ZN21CalenThickLinesDrawer11qt_metacallEN11QMetaObject4CallEiPPv @ 155 NONAME
+ _ZN21CalenThickLinesDrawer11qt_metacastEPKc @ 156 NONAME
+ _ZN21CalenThickLinesDrawer16staticMetaObjectE @ 157 NONAME DATA 16
+ _ZN21CalenThickLinesDrawer17handleThemeChangeEv @ 158 NONAME
+ _ZN21CalenThickLinesDrawer19getStaticMetaObjectEv @ 159 NONAME
+ _ZN21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 160 NONAME
+ _ZN21CalenThickLinesDrawerC1EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 161 NONAME
+ _ZN21CalenThickLinesDrawerC2EN17CalendarNamespace10WidgetTypeEP13QGraphicsItem @ 162 NONAME
+ _ZN21CalenThickLinesDrawerD0Ev @ 163 NONAME
+ _ZN21CalenThickLinesDrawerD1Ev @ 164 NONAME
+ _ZN21CalenThickLinesDrawerD2Ev @ 165 NONAME
+ _ZN22CalenDayHourScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 166 NONAME
+ _ZN22CalenDayHourScrollArea11qt_metacastEPKc @ 167 NONAME
+ _ZN22CalenDayHourScrollArea11setDateTimeERK9QDateTime @ 168 NONAME
+ _ZN22CalenDayHourScrollArea12scrollToHourEi @ 169 NONAME
+ _ZN22CalenDayHourScrollArea16scrollVerticallyERK7QPointF @ 170 NONAME
+ _ZN22CalenDayHourScrollArea16staticMetaObjectE @ 171 NONAME DATA 16
+ _ZN22CalenDayHourScrollArea19getStaticMetaObjectEv @ 172 NONAME
+ _ZN22CalenDayHourScrollAreaC1EP13QGraphicsItem @ 173 NONAME
+ _ZN22CalenDayHourScrollAreaC2EP13QGraphicsItem @ 174 NONAME
+ _ZN22CalenDayHourScrollAreaD0Ev @ 175 NONAME
+ _ZN22CalenDayHourScrollAreaD1Ev @ 176 NONAME
+ _ZN22CalenDayHourScrollAreaD2Ev @ 177 NONAME
+ _ZN25CalenDayContentScrollArea11eventFilterEP7QObjectP6QEvent @ 178 NONAME
+ _ZN25CalenDayContentScrollArea11qt_metacallEN11QMetaObject4CallEiPPv @ 179 NONAME
+ _ZN25CalenDayContentScrollArea11qt_metacastEPKc @ 180 NONAME
+ _ZN25CalenDayContentScrollArea12gestureEventEP13QGestureEvent @ 181 NONAME
+ _ZN25CalenDayContentScrollArea12moveFinishedEv @ 182 NONAME
+ _ZN25CalenDayContentScrollArea14scrollByAmountERK7QPointF @ 183 NONAME
+ _ZN25CalenDayContentScrollArea16staticMetaObjectE @ 184 NONAME DATA 16
+ _ZN25CalenDayContentScrollArea17checkPanDirectionEP11QPanGesture @ 185 NONAME
+ _ZN25CalenDayContentScrollArea18orientationChangedEN2Qt11OrientationE @ 186 NONAME
+ _ZN25CalenDayContentScrollArea19getStaticMetaObjectEv @ 187 NONAME
+ _ZN25CalenDayContentScrollArea20scrollToMiddleWidgetEv @ 188 NONAME
+ _ZN25CalenDayContentScrollArea21scrollAreaMoveStartedE20CalenScrollDirection @ 189 NONAME
+ _ZN25CalenDayContentScrollArea22scrollAreaMoveFinishedE20CalenScrollDirection @ 190 NONAME
+ _ZN25CalenDayContentScrollArea5eventEP6QEvent @ 191 NONAME
+ _ZN25CalenDayContentScrollArea6moveToERK7QPointFi @ 192 NONAME
+ _ZN25CalenDayContentScrollAreaC1EP13QGraphicsItem @ 193 NONAME
+ _ZN25CalenDayContentScrollAreaC2EP13QGraphicsItem @ 194 NONAME
+ _ZN25CalenDayContentScrollAreaD0Ev @ 195 NONAME
+ _ZN25CalenDayContentScrollAreaD1Ev @ 196 NONAME
+ _ZN25CalenDayContentScrollAreaD2Ev @ 197 NONAME
+ _ZNK14CalenMonthGrid10metaObjectEv @ 198 NONAME
+ _ZNK14CalenMonthView10metaObjectEv @ 199 NONAME
+ _ZNK16CalenPreviewPane10metaObjectEv @ 200 NONAME
+ _ZNK17CalenSettingsView10metaObjectEv @ 201 NONAME
+ _ZNK21CalenThickLinesDrawer10metaObjectEv @ 202 NONAME
+ _ZNK22CalenDayHourScrollArea10metaObjectEv @ 203 NONAME
+ _ZNK22CalenDayHourScrollArea8dateTimeEv @ 204 NONAME
+ _ZNK25CalenDayContentScrollArea10metaObjectEv @ 205 NONAME
+ _ZNK25CalenDayContentScrollArea17isHorizontalSwipeEf @ 206 NONAME
+ _ZTI14CalenMonthGrid @ 207 NONAME
+ _ZTI14CalenMonthView @ 208 NONAME
+ _ZTI16CalenPreviewPane @ 209 NONAME
+ _ZTI17CalenSettingsView @ 210 NONAME
+ _ZTI21CalenThickLinesDrawer @ 211 NONAME
+ _ZTI22CalenDayHourScrollArea @ 212 NONAME
+ _ZTI25CalenDayContentScrollArea @ 213 NONAME
+ _ZTV14CalenMonthGrid @ 214 NONAME
+ _ZTV14CalenMonthView @ 215 NONAME
+ _ZTV16CalenPreviewPane @ 216 NONAME
+ _ZTV17CalenSettingsView @ 217 NONAME
+ _ZTV21CalenThickLinesDrawer @ 218 NONAME
+ _ZTV22CalenDayHourScrollArea @ 219 NONAME
+ _ZTV25CalenDayContentScrollArea @ 220 NONAME
+ _ZThn16_N12CalenDayViewD0Ev @ 221 NONAME
+ _ZThn16_N12CalenDayViewD1Ev @ 222 NONAME
+ _ZThn16_N14CalenMonthGridD0Ev @ 223 NONAME
+ _ZThn16_N14CalenMonthGridD1Ev @ 224 NONAME
+ _ZThn16_N14CalenMonthViewD0Ev @ 225 NONAME
+ _ZThn16_N14CalenMonthViewD1Ev @ 226 NONAME
+ _ZThn16_N15CalenAgendaViewD0Ev @ 227 NONAME
+ _ZThn16_N15CalenAgendaViewD1Ev @ 228 NONAME
+ _ZThn16_N16CalenPluginLabelD0Ev @ 229 NONAME
+ _ZThn16_N16CalenPluginLabelD1Ev @ 230 NONAME
+ _ZThn16_N16CalenPreviewPaneD0Ev @ 231 NONAME
+ _ZThn16_N16CalenPreviewPaneD1Ev @ 232 NONAME
+ _ZThn16_N17CalenSettingsViewD0Ev @ 233 NONAME
+ _ZThn16_N17CalenSettingsViewD1Ev @ 234 NONAME
+ _ZThn16_N21CalenAgendaViewWidgetD0Ev @ 235 NONAME
+ _ZThn16_N21CalenAgendaViewWidgetD1Ev @ 236 NONAME
+ _ZThn16_N21CalenThickLinesDrawerD0Ev @ 237 NONAME
+ _ZThn16_N21CalenThickLinesDrawerD1Ev @ 238 NONAME
+ _ZThn16_N22CalenDayHourScrollAreaD0Ev @ 239 NONAME
+ _ZThn16_N22CalenDayHourScrollAreaD1Ev @ 240 NONAME
+ _ZThn16_N25CalenDayContentScrollAreaD0Ev @ 241 NONAME
+ _ZThn16_N25CalenDayContentScrollAreaD1Ev @ 242 NONAME
+ _ZThn8_N12CalenDayViewD0Ev @ 243 NONAME
+ _ZThn8_N12CalenDayViewD1Ev @ 244 NONAME
+ _ZThn8_N14CalenMonthGrid15mousePressEventEP24QGraphicsSceneMouseEvent @ 245 NONAME
+ _ZThn8_N14CalenMonthGrid17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 246 NONAME
+ _ZThn8_N14CalenMonthGrid5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 247 NONAME
+ _ZThn8_N14CalenMonthGridD0Ev @ 248 NONAME
+ _ZThn8_N14CalenMonthGridD1Ev @ 249 NONAME
+ _ZThn8_N14CalenMonthViewD0Ev @ 250 NONAME
+ _ZThn8_N14CalenMonthViewD1Ev @ 251 NONAME
+ _ZThn8_N15CalenAgendaViewD0Ev @ 252 NONAME
+ _ZThn8_N15CalenAgendaViewD1Ev @ 253 NONAME
+ _ZThn8_N16CalenPluginLabelD0Ev @ 254 NONAME
+ _ZThn8_N16CalenPluginLabelD1Ev @ 255 NONAME
+ _ZThn8_N16CalenPreviewPaneD0Ev @ 256 NONAME
+ _ZThn8_N16CalenPreviewPaneD1Ev @ 257 NONAME
+ _ZThn8_N17CalenSettingsViewD0Ev @ 258 NONAME
+ _ZThn8_N17CalenSettingsViewD1Ev @ 259 NONAME
+ _ZThn8_N21CalenAgendaViewWidgetD0Ev @ 260 NONAME
+ _ZThn8_N21CalenAgendaViewWidgetD1Ev @ 261 NONAME
+ _ZThn8_N21CalenThickLinesDrawer5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 262 NONAME
+ _ZThn8_N21CalenThickLinesDrawerD0Ev @ 263 NONAME
+ _ZThn8_N21CalenThickLinesDrawerD1Ev @ 264 NONAME
+ _ZThn8_N22CalenDayHourScrollAreaD0Ev @ 265 NONAME
+ _ZThn8_N22CalenDayHourScrollAreaD1Ev @ 266 NONAME
+ _ZThn8_N25CalenDayContentScrollAreaD0Ev @ 267 NONAME
+ _ZThn8_N25CalenDayContentScrollAreaD1Ev @ 268 NONAME
--- a/calendarui/views/inc/calenagendaview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/calenagendaview.h Fri Sep 17 08:29:05 2010 +0300
@@ -75,13 +75,6 @@
CALENAGENDAVIEW_EXPORT virtual void doPopulation();
/**
- * @brief Callback function for any notifications that has been
- * subscribed by this view
- * @param notification The event for which notification is being sent
- */
- CALENAGENDAVIEW_EXPORT void HandleNotification(const TCalenNotification notification);
-
- /**
* @brief Getter function for the document loader. Called from the content
* widget in order get its children
*/
--- a/calendarui/views/inc/calenagendaviewwidget.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/calenagendaviewwidget.h Fri Sep 17 08:29:05 2010 +0300
@@ -103,25 +103,6 @@
*/
void createNewEvent();
- /**
- * @brief check if property has to set
- */
- bool hasAllDayIcon();
-
- /**
- * @brief check if all day icon is present
- */
- void checkEntryIcons();
-
- /**
- * @brief return true if all day icon is present
- */
- bool isAllDayIcon();
-
-
-
-
-
private:
/**
@@ -372,10 +353,6 @@
* @brief Holds notes editor plugin load info.
*/
bool mNotesPluginLoaded;
- int mIndex;
- bool mIconCheck;
- bool mNextEntry;
- bool mLeftAllDayIcon;
};
--- a/calendarui/views/inc/caleneventlistviewitem.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/caleneventlistviewitem.h Fri Sep 17 08:29:05 2010 +0300
@@ -20,19 +20,17 @@
// System includes
#include <hblistviewitem.h>
-#include "calenagendaviewwidget.h"
class CalenEventListViewItem : public HbListViewItem
{
Q_OBJECT
- Q_PROPERTY(bool leftAllDayIcon READ hasAllDayIcon WRITE setAllDayLeftIcon)
-
+
public:
/**
* @brief Constructor
* @param CalenAgendaViewWidget
*/
- CalenEventListViewItem(CalenAgendaViewWidget *parent = 0);
+ CalenEventListViewItem(QGraphicsItem *parent = 0);
/**
* @brief Destructor
@@ -49,19 +47,6 @@
*/
void updateChildItems();
- /**
- * @brief check if all day icon is present
- */
- bool hasAllDayIcon();
-
- /**
- * @brief sets teh all day icon
- */
- void setAllDayLeftIcon(bool icon = false);
-
-private:
- CalenAgendaViewWidget* mParent;
- bool mAllDayIcon ;
};
#endif // __CALEN_EVENT_LIST_VIEW_ITEM_H__
--- a/calendarui/views/inc/calenmonthgrid.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/calenmonthgrid.h Fri Sep 17 08:29:05 2010 +0300
@@ -106,6 +106,7 @@
QPointF mStartPos;
QColor mGridLineColor;
bool mActiveDatesSet;
+ bool mIsGridAdjusting;
};
#endif // CALENMONTHGRID_H
--- a/calendarui/views/inc/calennativeview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/calennativeview.h Fri Sep 17 08:29:05 2010 +0300
@@ -64,7 +64,10 @@
void HandleNotification( const TCalenNotification notification );
virtual void onLocaleChanged(int reason)=0;
virtual void onContextChanged() {};
-
+
+ signals:
+ void closeDialogs();
+
protected slots:
void goToDate();
--- a/calendarui/views/inc/calenpreviewpane.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/inc/calenpreviewpane.h Fri Sep 17 08:29:05 2010 +0300
@@ -60,6 +60,7 @@
private:
void GetInstanceListL();
void checkStartTimeOfEvent(QDateTime &dateTime);
+ void tapTriggered();
public slots:
void onTwoSecondsTimeout();
--- a/calendarui/views/resources/caleneventlistviewitem.css Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/resources/caleneventlistviewitem.css Fri Sep 17 08:29:05 2010 +0300
@@ -1,9 +1,8 @@
-CalenEventListViewItem[leftAllDayIcon="false"]{
+CalenEventListViewItem{
layout: custom;
}
-
-CalenEventListViewItem[leftAllDayIcon="true"]{
- layout: custom-subjecticon;
+CalenEventListViewItem[customstretch="true"]{
+ layout: custom-stretch;
}
@@ -34,7 +33,7 @@
}
CalenEventListViewItem::text-1{
- top: -var(hb-param-margin-gene-top);
+
left: -var(hb-param-margin-gene-left);
font-variant: secondary;
text-height: var(hb-param-text-height-secondary);
@@ -72,3 +71,26 @@
}
+CalenEventListViewItem::text-2:landscape[customstretch="true"]{
+ top: -var(hb-param-margin-gene-top);
+ bottom: var(hb-param-margin-gene-bottom);
+ left: -var(hb-param-margin-gene-middle-horizontal);
+ right: var(hb-param-margin-gene-middle-horizontal);
+ font-variant: primary;
+ text-height: var(hb-param-text-height-primary);
+ text-align: left;
+
+}
+
+CalenEventListViewItem::icon-3:landscape[customstretch="true"]{
+ right: var(hb-param-margin-gene-middle-horizontal);
+ fixed-width: var(hb-param-graphic-size-secondary);
+ fixed-height: var(hb-param-graphic-size-secondary);
+}
+
+CalenEventListViewItem::text-3:landscape[customstretch="true"]{
+ fixed-width: 40un;
+ font-variant: secondary;
+ text-height: var(hb-param-text-height-secondary);
+ text-align: left;
+}
\ No newline at end of file
--- a/calendarui/views/resources/caleneventlistviewitem.widgetml Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/resources/caleneventlistviewitem.widgetml Fri Sep 17 08:29:05 2010 +0300
@@ -1,61 +1,69 @@
<hbwidget version="0.1" type="CalenEventListViewItem">
+
+<!-- custom -->
+ <!--
+ Items from left to right:
+ <- icon-1 -> text-1 -> text-2 -> icon-2 -> icon-3 ->
+ <- text-3 -> text-4 -> icon-4 ->
+ -->
+
<layout name="custom" type="mesh">
- <meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+
+ <meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+
+ <meshitem src="text-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
+ <meshitem src="text-1" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="RIGHT"/>
- <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="RIGHT"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
- <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
- <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
-
+ <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
+ <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
<meshitem src="text-4" srcEdge="TOP" dst="text-3" dstEdge="TOP"/>
<meshitem src="text-4" srcEdge="LEFT" dst="text-1" dstEdge="LEFT"/>
- <meshitem src="text-4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
-
-
+ <meshitem src="text-4" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
<meshitem src="icon-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
<meshitem src="icon-2" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
<meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
<meshitem src="icon-4" srcEdge="CENTERV" dst="text-3" dstEdge="CENTERV"/>
<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
- </layout>
+
+ </layout>
+
- <layout name="custom-subjecticon" type="mesh">
-
- <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
+ <layout name="custom-stretch" type="mesh">
+
+ <meshitem src="icon-1" srcEdge="LEFT" dst="" dstEdge="LEFT"/>
<meshitem src="icon-1" srcEdge="TOP" dst="text-2" dstEdge="TOP"/>
-
- <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
- <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
- <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+
+
+ <meshitem src="text-2" srcEdge="TOP" dst="" dstEdge="TOP"/>
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
+ <meshitem src="text-2" srcEdge="RIGHT" dst="icon-2" dstEdge="LEFT"/>
+ <meshitem src="text-2" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT"/>
-
- <meshitem src="text-3" srcEdge="LEFT" dst="text-2" dstEdge="LEFT"/>
- <meshitem src="text-2" srcEdge="BOTTOM" dst="text-3" dstEdge="TOP"/>
- <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
- <meshitem src="text-3" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM"/>
-
- <meshitem src="icon-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-3" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
+ <meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
<meshitem src="icon-2" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-2" srcEdge="RIGHT" dst="icon-3" dstEdge="LEFT"/>
+
+ <meshitem src="icon-3" srcEdge="RIGHT" dst="text-3" dstEdge="LEFT"/>
+ <meshitem src="icon-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
- <meshitem src="icon-4" srcEdge="CENTERV" dst="text-3" dstEdge="CENTERV"/>
+ <meshitem src="text-3" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+ <meshitem src="text-3" srcEdge="RIGHT" dst="icon-4" dstEdge="LEFT"/>
+
<meshitem src="icon-4" srcEdge="RIGHT" dst="" dstEdge="RIGHT"/>
-
- </layout>
-
-
+ <meshitem src="icon-4" srcEdge="CENTERV" dst="text-2" dstEdge="CENTERV"/>
+
+ </layout>
+
+
</hbwidget>
\ No newline at end of file
--- a/calendarui/views/src/calenagendaview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calenagendaview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -18,6 +18,7 @@
// System includes
#include <QGraphicsSceneEvent>
#include <hbmainwindow.h>
+#include <hbmenu.h>
#include <hbaction.h>
#include <hbpangesture.h>
#include <hbswipegesture.h>
@@ -217,20 +218,6 @@
}
// ----------------------------------------------------------------------------
-// CalenAgendaView::HandleNotification
-// Rest of the details are commented in the header
-// ----------------------------------------------------------------------------
-//
-void CalenAgendaView::HandleNotification(const TCalenNotification notification)
-{
- OstTraceFunctionEntry0( CALENAGENDAVIEW_HANDLENOTIFICATION_ENTRY );
-
- Q_UNUSED(notification)
- // No implementation yet
- OstTraceFunctionExit0( CALENAGENDAVIEW_HANDLENOTIFICATION_EXIT );
-}
-
-// ----------------------------------------------------------------------------
// CalenAgendaView::docLoader
// Rest of the details are commented in the header
// ----------------------------------------------------------------------------
@@ -315,6 +302,8 @@
// Connect to the signal triggered by settings action
connect(settingsAction, SIGNAL(triggered()), this, SLOT(launchSettingsView()));
+ // Close the menu once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close()));
OstTraceFunctionExit0( CALENAGENDAVIEW_SETUPACTIONS_EXIT );
}
--- a/calendarui/views/src/calenagendaviewwidget.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calenagendaviewwidget.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -58,7 +58,7 @@
const QString space(" ");
const QString singleHyphen("-");
const QString customLayout("custom");
-const char *stretchLayout("stretchItem");
+const char *stretchLayout("customstretch");
const QString toDoIcon("qtg_small_todo");
const QString reminderIcon("qtg_mono_alarm");
const QString locationIcon("qtg_mono_location");
@@ -79,9 +79,7 @@
mDocLoader(docLoader),
mRegionalInfoGroupBox(NULL),
mLongTapEventFlag(false),
-mNotesPluginLoaded(false),
-mIndex(0),
-mIconCheck(false)
+mNotesPluginLoaded(false)
{
OstTraceFunctionEntry0( CALENAGENDAVIEWWIDGET_CALENAGENDAVIEWWIDGET_ENTRY );
@@ -374,12 +372,7 @@
// of items in the list. Remove the extra rows
mListModel->removeRows(0, mListModel->rowCount() - mInstanceArray.count());
}
- //to set the index to first item of the list , when view refresh
- mIndex = 0;
- //status reset for not setting any property
- mIconCheck = false;
mListModel->setColumnCount(singleColumn);
- mIconCheck = true;
// Add all the events to the list
for (int index = 0; index < mInstanceArray.count(); index++) {
// Get each of the entry details
@@ -447,10 +440,11 @@
// Append a single space
dayString.append(singleSpace);
// Set the heading
- // Append the date which is formatted as per the locale
- mHeadingLabel->setHeading(hbTrId(
- "txt_calendar_subhead_1_2").arg(dayString).arg(
- systemLocale.format(mDate.date(), r_qtn_date_usual_with_zero)));
+
+ // Append the date which is formatted as per the locale
+ mHeadingLabel->setHeading(QString("%1 %2").arg(dayString).arg(
+ systemLocale.format(mDate.date(), r_qtn_date_usual_with_zero)));
+
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_SETHEADINGTEXT_EXIT );
}
@@ -629,12 +623,7 @@
}else {
textData<<QString(space);
}
- // Get the list model index and set the text and icon data
- QModelIndex listIndex = mListModel->index(index, 0);
- mNextEntry = false;
- mListModel->setData(listIndex, textData, Qt::DisplayRole);
- mNextEntry = true;
- mListModel->setData(listIndex, iconData, Qt::DecorationRole);
+
// Disable item stretching by removing the dynamic property
HbListViewItem *listViewItem = static_cast<HbListViewItem*>
@@ -642,7 +631,10 @@
if (listViewItem) {
listViewItem->setProperty(stretchLayout, false);
}
-
+ // Get the list model index and set the text and icon data
+ QModelIndex listIndex = mListModel->index(index, 0);
+ mListModel->setData(listIndex, textData, Qt::DisplayRole);
+ mListModel->setData(listIndex, iconData, Qt::DecorationRole);
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDTIMEDEVENTTOLIST_EXIT );
}
@@ -795,14 +787,6 @@
}
}
}
-
- // Get the list model index and set the text and icon data
- QModelIndex listIndex = mListModel->index(index, 0);
- mNextEntry = false;
- mListModel->setData(listIndex, textData, Qt::DisplayRole);
- mNextEntry = true;
- mListModel->setData(listIndex, iconData, Qt::DecorationRole);
-
// Enable item stretching by adding the dynamic property
HbListViewItem *listViewItem = static_cast<HbListViewItem*>
(mEventsList->itemByIndex(mListModel->index(index, 0)));
@@ -815,6 +799,10 @@
listViewItem->setProperty(stretchLayout, false);
}
}
+ // Get the list model index and set the text and icon data
+ QModelIndex listIndex = mListModel->index(index, 0);
+ mListModel->setData(listIndex, textData, Qt::DisplayRole);
+ mListModel->setData(listIndex, iconData, Qt::DecorationRole);
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_ADDNONTIMEDEVENTTOLIST_EXIT );
}
@@ -862,6 +850,12 @@
// css file, else wierd things might happen
listItem->setProperty(stretchLayout, true);
}
+ if (orientation == Qt::Vertical) {
+ // Set a dynamic property to indicate that this list item
+ // NOTE: Property name MUST match the name specified in
+ // css file, else wierd things might happen
+ listItem->setProperty(stretchLayout, false);
+ }
}
}
break;
@@ -1033,9 +1027,7 @@
// Set the context
setContextFromHighlight(entry);
-
- //for not setting any property again
- mIconCheck = false;
+
// Launch the event viewer.
mServices.IssueCommandL(ECalenEventView);
@@ -1154,6 +1146,9 @@
this,
SLOT(contextMenuClosed()));
+ // Close the context menu once closeDialogs() is received
+ connect(mView, SIGNAL(closeDialogs()), contextMenu, SLOT(close()));
+
contextMenu->open(this, SLOT(contextManuTriggered(HbAction *)));
OstTraceFunctionExit0( DUP1_CALENAGENDAVIEWWIDGET_ITEMLONGPRESSED_EXIT );
@@ -1279,53 +1274,5 @@
OstTraceFunctionExit0( CALENAGENDAVIEWWIDGET_CLEARLISTMODEL_EXIT );
}
-// ----------------------------------------------------------------------------
-// CalenAgendaViewWidget::hasAllDayIcon
-// return true if property for all day icon to set
-// ----------------------------------------------------------------------------
-//
-bool CalenAgendaViewWidget::hasAllDayIcon()
- {
- return mIconCheck;
- }
-
-
-// ----------------------------------------------------------------------------
-// CalenAgendaViewWidget::checkEntryIcons
-// check if all day icon is present
-// ----------------------------------------------------------------------------
-//
-void CalenAgendaViewWidget::checkEntryIcons()
- {
- int index = 0;
- //check the number of entries
- index = mInstanceArray.count();
- // Get each of the entry details
- AgendaEntry entry;
- if(mIndex < index )
- entry = mInstanceArray[mIndex];
-
- mLeftAllDayIcon = false;
-
- if(!entry.isTimedEntry() || CalenAgendaUtils::isAlldayEvent(entry)){
- //all day icon is not there if its a timed entry
- mLeftAllDayIcon = true;
- }
-
- //check if shift to next entry
- if(mNextEntry)
- mIndex++;
-
- }
-
-// ----------------------------------------------------------------------------
-// CalenAgendaViewWidget::isAllDayIcon
-// retirn true if all day icon is present
-// ----------------------------------------------------------------------------
-//
-bool CalenAgendaViewWidget::isAllDayIcon()
- {
- return mLeftAllDayIcon;
- }
// End of file --Don't remove this.
--- a/calendarui/views/src/caleneventlistviewitem.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/caleneventlistviewitem.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -30,8 +30,8 @@
// constructor
// ----------------------------------------------------------------------------
//
-CalenEventListViewItem::CalenEventListViewItem(CalenAgendaViewWidget *parent) :
-HbListViewItem(parent),mParent(parent),mAllDayIcon(false)
+CalenEventListViewItem::CalenEventListViewItem(QGraphicsItem *parent) :
+HbListViewItem(parent)
{
OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_CALENEVENTLISTVIEWITEM_ENTRY );
@@ -72,35 +72,10 @@
void CalenEventListViewItem::updateChildItems()
{
OstTraceFunctionEntry0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_ENTRY );
- if(mParent->hasAllDayIcon())
- {
- mParent->checkEntryIcons();
- mAllDayIcon = mParent->isAllDayIcon();
- }
-
HbListViewItem::updateChildItems();
OstTraceFunctionExit0( CALENEVENTLISTVIEWITEM_UPDATECHILDITEMS_EXIT );
}
-// ----------------------------------------------------------------------------
-// CalenEventListViewItem::hasAllDayIcon
-// check if all day icon is there in item
-// ----------------------------------------------------------------------------
-//
-bool CalenEventListViewItem::hasAllDayIcon()
- {
- return mAllDayIcon ;
- }
-
-// ----------------------------------------------------------------------------
-// CalenEventListViewItem::setAllDayLeftIcon
-// set the all day icon
-// ----------------------------------------------------------------------------
-//
-void CalenEventListViewItem::setAllDayLeftIcon(bool icon)
- {
- mAllDayIcon = icon;
- }
// End of file
--- a/calendarui/views/src/calenmonthgrid.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calenmonthgrid.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -66,7 +66,8 @@
mIsNonActiveDayFocused(false),
mIgnoreItemActivated(false),
mGridLineColor(HbColorScheme::color("qtc_cal_grid_line")),
- mActiveDatesSet(false)
+ mActiveDatesSet(false),
+ mIsGridAdjusting(false)
{
OstTraceFunctionEntry0( CALENMONTHGRID_CALENMONTHGRID_ENTRY );
@@ -340,7 +341,7 @@
void CalenMonthGrid::downGesture()
{
OstTraceFunctionEntry0( CALENMONTHGRID_DOWNGESTURE_ENTRY );
-
+ mIsGridAdjusting = true;
// Make sure that content widget is properly placed
// We are doing this as tapping on inactive date of previous month is leading to
// position the grid at wrong place after scrolling down. Hence, set the grid
@@ -380,8 +381,9 @@
void CalenMonthGrid::upGesture()
{
OstTraceFunctionEntry0( CALENMONTHGRID_UPGESTURE_ENTRY );
-
-
+
+ mIsGridAdjusting = true;
+
// Set the required flags
mDirection = up;
mIsAtomicScroll = false;
@@ -444,6 +446,15 @@
{
OstTraceFunctionEntry0( CALENMONTHGRID_GESTUREEVENT_ENTRY );
+ // Dont listem for any gesture when grid is getting adjusted as listening to those was causing
+ // grid to stop abruptly i between
+ if (mIsGridAdjusting) {
+ // consume the event and return
+ qDebug()<<"RETURNING BACK";
+ event->ignore();
+ return;
+ }
+
if(HbPanGesture *gesture = qobject_cast<HbPanGesture *>(event->gesture(Qt::PanGesture))) {
if (gesture->state() == Qt::GestureStarted) {
mIsAtomicScroll = false;
@@ -542,10 +553,19 @@
void CalenMonthGrid::scrollingFinished()
{
OstTraceFunctionEntry0( CALENMONTHGRID_SCROLLINGFINISHED_ENTRY );
-
+
+ mIsGridAdjusting = false;
if (mIsPanGesture) {
handlePanGestureFinished();
- } else if(!mIsAtomicScroll) {
+ // Check if still request has been made for scrolling
+ // if yes, then simply return
+ if (mDirection != invalid) {
+ mIgnoreItemActivated = false;
+ return;
+ }
+ }
+
+ if(!mIsAtomicScroll) {
QDateTime activeDate = mView->getActiveDay();
if(mDirection == down) { // down gesture
if (!mActiveDatesSet) {
@@ -579,6 +599,8 @@
OstTraceFunctionEntry0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_ENTRY );
mIsPanGesture = false;
+ // Reset the mDirection flag
+ mDirection = invalid;
// Get the first item that is visible
QList<HbAbstractViewItem *> list = visibleItems();
HbAbstractViewItem* item = list[0];
@@ -613,8 +635,8 @@
// first visible item belongs to previous month
// Check if the date is more than half of the previous month
if (date.date().day() > (prevMonth.date().daysInMonth()) / 2) {
- // we should again show the current month by scrolling upwards
- mDirection = up;
+ // we should again show the current month by scrolling downwards
+ mDirection = down;
mIsAtomicScroll = true;
scrollContentsTo(-mStartPos,500);
} else {
@@ -634,12 +656,17 @@
} else {
// we should again show the current month by scrolling upwards
mDirection = up;
+ mIsAtomicScroll = true;
scrollContentsTo(-mStartPos,500);
}
} else if (month == nextMonth.addMonths(1).date().month()) {
// first visible date belongs to next to next month
// hence, scroll up to show the next month
upGesture();
+ } else {
+ // User has panned so that exact month has been scrolled
+ // no need for any adjustment here, just append/prepend the rows
+ mIsAtomicScroll = false;
}
OstTraceFunctionExit0( CALENMONTHGRID_HANDLEPANGESTUREFINISHED_EXIT );
--- a/calendarui/views/src/calenmonthview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calenmonthview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -328,7 +328,10 @@
// Connect to the signal when options menu is shown
// This is required to add/remove dynamically some options
connect(menu(), SIGNAL(aboutToShow ()), this,
- SLOT(addRemoveActionsInMenu()));
+ SLOT(addRemoveActionsInMenu()));
+ // Close the menu once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), menu(), SLOT(close()));
+
//add "show lunar data" action item ,if regional plugin is present
//regional plugin will add the option itself and handles it accordingly
//use this api after adding all action item to the menu
--- a/calendarui/views/src/calennativeview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calennativeview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -65,6 +65,7 @@
notificationArray.Append(ECalenNotifySystemTimeChanged);
notificationArray.Append(ECalenNotifySystemLocaleChanged);
notificationArray.Append(ECalenNotifyContextChanged);
+ notificationArray.Append(ECalenNotifyCloseDialogs);
mServices.RegisterForNotificationsL(this, notificationArray);
@@ -130,6 +131,7 @@
// Create a popup with datepicker for the user to select date.
HbDialog *popUp = new HbDialog();
+ popUp->setParent(this);
popUp->setDismissPolicy(HbDialog::NoDismiss);
popUp->setTimeout(HbDialog::NoTimeout);
popUp->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -149,6 +151,10 @@
popUp->addAction(okAction);
connect(okAction, SIGNAL(triggered()), this, SLOT(goToSelectedDate()));
popUp->addAction(new HbAction(hbTrId("txt_common_button_cancel"), popUp));
+
+ // Close the popup once closeDialogs() is received
+ connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close()));
+
popUp->open();
OstTraceFunctionExit0( CALENNATIVEVIEW_GOTODATE_EXIT );
@@ -236,6 +242,11 @@
onContextChanged();
}
break;
+ case ECalenNotifyCloseDialogs: {
+ // Emit the signal to close the dialogs which are already opened
+ emit closeDialogs();
+ }
+ break;
default:
break;
}
--- a/calendarui/views/src/calenpreviewpane.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/src/calenpreviewpane.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -421,6 +421,9 @@
event->accept(Qt::PanGesture);
} else {
event->accept(Qt::PanGesture);
+ // Since user tried to tap and ended up giving low pan
+ // hence, handle it as tap
+ tapTriggered();
OstTraceFunctionExit0( DUP1_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
@@ -437,6 +440,9 @@
event->accept(Qt::PanGesture);
}else {
event->accept(Qt::PanGesture);
+ // Since user tried to tap and ended up giving low pan
+ // hence, handle it as tap
+ tapTriggered();
OstTraceFunctionExit0( DUP2_CALENPREVIEWPANE_GESTUREEVENT_EXIT );
return;
}
@@ -444,14 +450,15 @@
}
} else if(QTapGesture *tapGesture = qobject_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
- HbInstantFeedback::play(HbFeedback::Basic);
- // Preview pane tapped
- // Stop the scrolling first
- stopScrolling();
- // Issue command to launch agenda view
- mServices.IssueCommandL(ECalenAgendaView);
- mView->disconnectAboutToQuitEvent();
- event->accept(Qt::TapGesture);
+ event->accept(Qt::TapGesture);
+ // Handle the tap
+ tapTriggered();
+ }
+ } else if(QTapAndHoldGesture *tapGesture = qobject_cast<QTapAndHoldGesture *>(event->gesture(Qt::TapAndHoldGesture))) {
+ if (tapGesture && tapGesture->state() == Qt::GestureFinished) {
+ event->accept(Qt::TapAndHoldGesture);
+ // Handle the tap
+ tapTriggered();
}
}
@@ -459,6 +466,24 @@
}
/*!
+ Handles the tap and launches the agendaview
+ */
+void CalenPreviewPane::tapTriggered()
+{
+ OstTraceFunctionEntry0( CALENPREVIEWPANE_TAPTRIGGERED_ENTRY );
+
+ HbInstantFeedback::play(HbFeedback::Basic);
+ // Preview pane tapped
+ // Stop the scrolling first
+ stopScrolling();
+ // Issue command to launch agenda view
+ mServices.IssueCommandL(ECalenAgendaView);
+ mView->disconnectAboutToQuitEvent();
+
+ OstTraceFunctionExit0( CALENPREVIEWPANE_TAPTRIGGERED_EXIT );
+}
+
+/*!
Set monthview pointer
*/
void CalenPreviewPane::setView(CalenMonthView* view)
--- a/calendarui/views/traces/calenpreviewpaneTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/traces/calenpreviewpaneTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -38,6 +38,8 @@
#define DUP3_CALENPREVIEWPANE_GESTUREEVENT_EXIT 0x8a0182
#define CALENPREVIEWPANE_HANDLETHEMECHANGE_ENTRY 0x8a0189
#define CALENPREVIEWPANE_HANDLETHEMECHANGE_EXIT 0x8a018a
+#define CALENPREVIEWPANE_TAPTRIGGERED_ENTRY 0x8a018d
+#define CALENPREVIEWPANE_TAPTRIGGERED_EXIT 0x8a018e
#endif
--- a/calendarui/views/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/calendarui/views/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -320,6 +320,8 @@
[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STARTAUTOSCROLL_EXIT=0x158
[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STOPSCROLLING_ENTRY=0x165
[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_STOPSCROLLING_EXIT=0x166
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_TAPTRIGGERED_ENTRY=0x18d
+[TRACE]TRACE_FLOW[0x8A]_CALENPREVIEWPANE_TAPTRIGGERED_EXIT=0x18e
[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_ENTRY=0x167
[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_CALENSETTINGSVIEW_EXIT=0x168
[TRACE]TRACE_FLOW[0x8A]_CALENSETTINGSVIEW_INITIALIZEFORM_ENTRY=0x16d
--- a/clock/clock.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clock.pro Fri Sep 17 08:29:05 2010 +0300
@@ -32,8 +32,24 @@
"./conf/clockapp.confml APP_LAYER_CONFML(clockapp.confml)" \
"./conf/clockapp_101F874D.crml APP_LAYER_CRML(clockapp_101F874D.crml)" \
"./conf/clockapp_101F8876.crml APP_LAYER_CRML(clockapp_101F8876.crml)" \
+ # splashml
+ "data/xml/clockapplication.docml /epoc32/data/z/resource/hb/splashml/clockapplication.docml" \
+ "data/xml/clockapplication.splashml /epoc32/data/z/resource/hb/splashml/clockapplication.splashml" \
# stubsis is added to provide IAD
- "./stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis"
+ "./stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis" \
+ # Backup registration file
+# Date Time Settings
+"data/backup_registration.xml /epoc32/data/z/private/10005906/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005906/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005906/backup_registration.xml" \
+ # Clockserver
+"data/backup_registration.xml /epoc32/data/z/private/200159A2/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/200159A2/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/200159A2/backup_registration.xml" \
+ # Clock
+"data/backup_registration.xml /epoc32/data/z/private/10005903/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10005903/backup_registration.xml" \
+"data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10005903/backup_registration.xml
}
# End of file --Don't remove this.
--- a/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockalarmeditor/src/clockalarmeditor.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -139,7 +139,7 @@
mAlarmEditorForm = qobject_cast<HbDataForm *> (
loader->findWidget("alarmEditorForm"));
-
+ mAlarmEditorForm->setItemPixmapCacheEnabled(true);
// Create the alarm info structure with desired values.
initAlarmInfo();
--- a/clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockcityselectionlist/data/xml/clockaddcitydialog.docml Fri Sep 17 08:29:05 2010 +0300
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<hbdocument version="1.1">
<object name="okAction" type="HbAction">
- <string name="text" value="Ok"/>
+ <string locid="txt_common_button_ok" name="text" value="Ok"/>
</object>
<object name="cancelAction" type="HbAction">
- <string name="text" value="Cancel"/>
+ <string locid="txt_common_button_cancel" name="text" value="Cancel"/>
</object>
<widget name="dialog" type="HbDialog">
<sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
@@ -16,7 +16,7 @@
<widget name="container" role="HbDialog:contentWidget" type="HbWidget">
<widget name="countryLabel" type="HbLabel">
<sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
- <string name="plainText" value="Country:"/>
+ <string locid="txt_clock_formlabel_country" name="plainText" value="Country:"/>
</widget>
<widget name="timezoneCombobox" type="HbComboBox">
<sizehint type="PREFERRED" width="46.38806un"/>
@@ -27,13 +27,13 @@
<widget name="cityNameLabel" type="HbLabel">
<sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
<sizehint height="expr(var(hb-param-text-height-secondary) )" type="MINIMUM"/>
- <string name="plainText" value="City name:"/>
+ <string locid="txt_clock_formlabel_city_name" name="plainText" value="City name:"/>
</widget>
<widget name="counrtyCombobox" type="HbComboBox">
</widget>
<widget name="timezoneLabel" type="HbLabel">
<sizehint height="expr(var(hb-param-text-height-secondary) )" type="PREFERRED" width="46.38806un"/>
- <string name="plainText" value="Timezone:"/>
+ <string locid="txt_clock_formlabel_timezone" name="plainText" value="Timezone:"/>
</widget>
<layout type="anchor">
<anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
@@ -61,24 +61,24 @@
<widget name="container" role="HbDialog:contentWidget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="cityNameLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="cityNameLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
<anchoritem dst="cityNameLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
<anchoritem dst="cityNameLineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
<anchoritem dst="cityNameLineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="cityNameLabel" srcEdge="BOTTOM"/>
- <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="countryLabel" srcEdge="BOTTOM"/>
- <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
<anchoritem dst="timezoneLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="timezoneLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="cityNameLineEdit" srcEdge="BOTTOM"/>
- <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="timezoneCombobox" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="cityNameLineEdit" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
<anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="timezoneLabel" srcEdge="BOTTOM"/>
- <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="countryLabel" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="countryLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="timezoneCombobox" srcEdge="BOTTOM"/>
- <anchoritem dst="countryLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="countryLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="countryLabel" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="timezoneCombobox" srcEdge="BOTTOM"/>
+ <anchoritem dst="countryLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-middle-vertical) )" src="countryLabel" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
<widget name="dialog" type="HbDialog">
@@ -104,19 +104,21 @@
<layout type="anchor">
<anchoritem dst="cityNameLineEdit" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-middle-horizontal) )" src="cityNameLabel" srcEdge="RIGHT"/>
<anchoritem dst="cityNameLineEdit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="TOP"/>
- <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="cityNameLineEdit" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
<anchoritem dst="cityNameLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
<anchoritem dst="cityNameLabel" dstEdge="CENTERV" spacing="0un" src="cityNameLineEdit" srcEdge="CENTERV"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-middle-horizontal) )" src="timezoneLabel" srcEdge="RIGHT"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="cityNameLineEdit" srcEdge="BOTTOM"/>
+ <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
<anchoritem dst="timezoneLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
- <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-middle-horizontal) )" src="timezoneCombobox" srcEdge="LEFT"/>
+ <anchoritem dst="timezoneLabel" dstEdge="RIGHT" spacing="0un" src="cityNameLabel" srcEdge="RIGHT"/>
<anchoritem dst="timezoneLabel" dstEdge="CENTERV" spacing="0un" src="timezoneCombobox" srcEdge="CENTERV"/>
- <anchoritem dst="timezoneCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
- <anchoritem dst="timezoneCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="cityNameLineEdit" srcEdge="BOTTOM"/>
<anchoritem dst="counrtyCombobox" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-middle-horizontal) )" src="countryLabel" srcEdge="RIGHT"/>
<anchoritem dst="counrtyCombobox" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) )" src="timezoneCombobox" srcEdge="BOTTOM"/>
- <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="counrtyCombobox" dstEdge="BOTTOM" spacing="expr(-var(hb-param-margin-gene-popup) )" src="" srcEdge="BOTTOM"/>
<anchoritem dst="countryLabel" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-popup) )" src="" srcEdge="LEFT"/>
+ <anchoritem dst="countryLabel" dstEdge="RIGHT" spacing="0un" src="cityNameLabel" srcEdge="RIGHT"/>
<anchoritem dst="countryLabel" dstEdge="CENTERV" spacing="0un" src="counrtyCombobox" srcEdge="CENTERV"/>
</layout>
</widget>
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -280,6 +280,13 @@
qFatal("Unable to load the document.");
}
+ if (Qt::Horizontal == window->orientation()) {
+ mAddCityDocloader->load(":/xml/clockaddcitydialog.docml",
+ "landscape", &success);
+ } else if (Qt::Vertical == window->orientation()) {
+ mAddCityDocloader->load(":/xml/clockaddcitydialog.docml",
+ "portrait", &success);
+ }
// Get the dialog.
mAddOwnCityDialog = static_cast<HbDialog *> (mAddCityDocloader->findWidget("dialog"));
if (!mAddOwnCityDialog) {
@@ -511,7 +518,7 @@
// Set the model to the list.
mListView->setModel(mProxyModel);
-
+ mListView->setItemPixmapCacheEnabled(true);
// Listen for list item activated signal.
connect(
mListView, SIGNAL(activated(QModelIndex)),
--- a/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockplugins/datetimesettingsplugin/src/datetimesettingsplugin.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -73,7 +73,9 @@
CpItemDataHelper &itemDataHelper) const
{
OstTraceFunctionEntry0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_ENTRY );
- HbIcon icon ;
+
+ QString datetimeIconString = "qtg_large_date_time";
+ HbIcon datetimeIcon(datetimeIconString) ;
HbExtendedLocale locale = HbExtendedLocale::system();
QString timeInfo = locale.format(
@@ -88,7 +90,7 @@
QList<CpSettingFormItemData*> entryItemList;
CpSettingFormItemData *entryItem = new DateTimeSettingsView(
itemDataHelper, hbTrId("txt_cp_main_view_list_time_date"),
- displayString,icon, 0, mTranslator);
+ displayString,datetimeIcon, 0, mTranslator);
entryItemList.append(entryItem);
OstTraceFunctionExit0( DATETIMESETTINGSPLUGIN_CREATESETTINGFORMITEMDATA_EXIT );
return entryItemList;
--- a/clock/clockui/clocksettingsview/inc/clockregionalsettingsview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/inc/clockregionalsettingsview.h Fri Sep 17 08:29:05 2010 +0300
@@ -52,6 +52,7 @@
CLOCKSETTINGSVIEW_EXPORT void showView();
public slots:
void updateWeekStartOn();
+ void updateOnLocaleChanges();
private slots:
void handleBackAction();
void handleItemDisplayed(const QModelIndex &index);
@@ -68,6 +69,10 @@
void populateFormModel();
QStringList weekdayList();
void updateWeekDays();
+ void updateTimeFormatField();
+ void updateTimeSeparatorField();
+ void updateDateFormatField();
+ void updateDateSeparatorField();
private:
--- a/clock/clockui/clocksettingsview/inc/clocksettingsview.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/inc/clocksettingsview.h Fri Sep 17 08:29:05 2010 +0300
@@ -64,6 +64,7 @@
void handleAlarmSnoozeTimeChanged(int index);
void handleClockTypeChanged();
void eventMonitor(const XQSettingsKey& key, const QVariant& value);
+ void updateClockType();
private:
void setupView();
--- a/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -129,6 +129,7 @@
if (!mForm) {
qFatal("Unable to find the form");
}
+ mForm->setItemPixmapCacheEnabled(true);
connect(
mForm, SIGNAL(itemShown(QModelIndex)),
this, SLOT(handleItemDisplayed(QModelIndex)));
@@ -523,6 +524,22 @@
}
/*!
+ update on locale changes.
+ */
+
+void ClockRegionalSettingsView::updateOnLocaleChanges()
+{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY );
+
+ updateTimeFormatField();
+ updateTimeSeparatorField();
+ updateDateFormatField();
+ updateDateSeparatorField();
+
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT );
+}
+
+/*!
update the week days .
*/
void ClockRegionalSettingsView::updateWeekDays()
@@ -556,4 +573,69 @@
}
OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT );
}
+
+/*!
+ update the time format field.
+ */
+void ClockRegionalSettingsView::updateTimeFormatField()
+{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY );
+ //for time format change
+ int index = mSettingsUtility->timeFormat(mTimeFormatStringList);
+ if (0 == index) {
+ mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[0]);
+ mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[1]);
+ } else {
+ mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[1]);
+ mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[0]);
+ }
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT );
+}
+
+/*!
+ update the time separator field.
+ */
+void ClockRegionalSettingsView::updateTimeSeparatorField()
+{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY );
+ // for time separator change
+ int index = mSettingsUtility->timeSeparator(mTimeSeparatorStringList);
+ if (0 == index) {
+ mTimeSeparatorItem->setContentWidgetData("text", mTimeSeparatorStringList[0]);
+ mTimeSeparatorItem->setContentWidgetData(
+ "additionalText", mTimeSeparatorStringList[1]);
+ } else {
+ mTimeSeparatorItem->setContentWidgetData("text", mTimeSeparatorStringList[1]);
+ mTimeSeparatorItem->setContentWidgetData(
+ "additionalText", mTimeSeparatorStringList[0]);
+ }
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT );
+}
+
+/*!
+ update the date format field.
+ */
+void ClockRegionalSettingsView::updateDateFormatField()
+{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY );
+
+ int index = mSettingsUtility->dateFormat(mDateFormatStringList);
+ mDateFormatItem->setContentWidgetData("currentIndex",index);
+
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT );
+}
+
+/*!
+ update the date separator field.
+ */
+void ClockRegionalSettingsView::updateDateSeparatorField()
+{
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY );
+
+ int index = mSettingsUtility->dateSeparator(mDateSeparatorStringList);
+ mDateSeparatorItem->setContentWidgetData("currentIndex",index);
+
+ OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT );
+}
+
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/src/clocksettingsview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -87,6 +87,9 @@
connect(
mTimezoneClient, SIGNAL(cityUpdated()),
this, SLOT(updatePlaceItem()));
+ connect(
+ mTimezoneClient, SIGNAL(timechanged()),
+ this, SLOT(updateClockType()));
// Start a timer. For updating the remaining alarm time.
mTickTimer = new QTimer(this);
@@ -313,7 +316,7 @@
// Get the data form.
mSettingsForm = static_cast<HbDataForm *> (
mDocLoader->findWidget(CLOCK_SETTINGS_DATA_FORM));
-
+ mSettingsForm->setItemPixmapCacheEnabled(true);
// Create the custom prototype.
QList <HbAbstractViewItem*> prototypes = mSettingsForm->itemPrototypes();
SettingsCustomItem *customPrototype = new SettingsCustomItem(mSettingsForm, mLaunchedByClock);
@@ -586,4 +589,23 @@
OstTraceFunctionExit0( CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT );
}
+/*!
+ Slot for updating the clock type on locale change.
+ */
+void ClockSettingsView::updateClockType()
+{
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY );
+ QStringList clockTypeList;
+ int clockType = mSettingsUtility->clockType(clockTypeList);
+ int zeroIndex(0);
+ if( zeroIndex == clockType ){
+ mClockTypeItem->setContentWidgetData("text", clockTypeList[0]);
+ mClockTypeItem->setContentWidgetData("additionalText", clockTypeList[1]);
+ } else {
+ mClockTypeItem->setContentWidgetData("text", clockTypeList[1]);
+ mClockTypeItem->setContentWidgetData("additionalText", clockTypeList[0]);
+ }
+ OstTraceFunctionEntry0( CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT );
+}
+
// End of file --Don't remove this.
--- a/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/src/settingscustomitem.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -439,6 +439,10 @@
connect(mTimezoneClient, SIGNAL(timechanged()),
view, SLOT(updateWeekStartOn()));
+ connect(mTimezoneClient, SIGNAL(timechanged()),
+ view, SLOT(updateOnLocaleChanges()));
+
+
view->showView();
OstTraceFunctionExit0( SETTINGSCUSTOMITEM_LAUNCHREGSETTINGSVIEW_EXIT );
--- a/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/OstTraceDefinitions.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+/*
+* This is Default Licence added by TraceCompiler
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef __OSTTRACEDEFINITIONS_H__
#define __OSTTRACEDEFINITIONS_H__
// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/clockregionalsettingsviewTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,21 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+* Definition file for class ClockRegionalSettingsView.
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __CLOCKREGIONALSETTINGSVIEWTRACES_H__
@@ -38,6 +55,16 @@
#define DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT 0x8a001e
#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY 0x8a001f
#define CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT 0x8a0020
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY 0x8a0066
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT 0x8a0067
+#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY 0x8a0068
+#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT 0x8a0069
+#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY 0x8a006a
+#define CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT 0x8a006b
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY 0x8a006c
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT 0x8a006d
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY 0x8a006e
+#define CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT 0x8a006f
#endif
--- a/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsdocloaderTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,21 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+* Implementation file for class ClockSettingsDocLoader.
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __CLOCKSETTINGSDOCLOADERTRACES_H__
--- a/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/clocksettingsviewTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,21 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+* Implementation file for class ClockSettingsView.
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __CLOCKSETTINGSVIEWTRACES_H__
@@ -38,8 +55,8 @@
#define CLOCKSETTINGSVIEW_HANDLECLOCKTYPECHANGED_EXIT 0x8a003f
#define CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY 0x8a0040
#define CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT 0x8a0041
-#define CLOCKSETTINGSVIEW_GETVIEW_ENTRY 0x8a0064
-#define CLOCKSETTINGSVIEW_GETVIEW_EXIT 0x8a0065
+#define CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY 0x8a0070
+#define CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT 0x8a0071
#endif
--- a/clock/clockui/clocksettingsview/traces/fixed_id.definitions Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/fixed_id.definitions Fri Sep 17 08:29:05 2010 +0300
@@ -1,3 +1,20 @@
+##
+# This is Default Licence added by TraceCompiler
+# 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:
+#
+##
#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
[GROUP]TRACE_FLOW=0x8a
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY=0x1
@@ -22,6 +39,16 @@
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT=0x19
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY=0x5
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT=0x6
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_ENTRY=0x6c
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATEFORMATFIELD_EXIT=0x6d
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_ENTRY=0x6e
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEDATESEPARATORFIELD_EXIT=0x6f
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_ENTRY=0x66
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEONLOCALECHANGES_EXIT=0x67
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_ENTRY=0x68
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMEFORMATFIELD_EXIT=0x69
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_ENTRY=0x6a
+[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATETIMESEPARATORFIELD_EXIT=0x6b
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY=0x1f
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT=0x20
[TRACE]TRACE_FLOW[0x8A]_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY=0x1c
@@ -35,8 +62,6 @@
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_CREATEMODEL_EXIT=0x37
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_ENTRY=0x40
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_EVENTMONITOR_EXIT=0x41
-[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_ENTRY=0x64
-[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_EXIT=0x65
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_ENTRY=0x3c
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEALARMSNOOZETIMECHANGED_EXIT=0x3d
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_HANDLEAUTOTIMEUPDATECHANGE_ENTRY=0x3a
@@ -55,6 +80,8 @@
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_POPULATEMODEL_EXIT=0x39
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_ENTRY=0x34
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_SETUPVIEW_EXIT=0x35
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_ENTRY=0x70
+[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATECLOCKTYPE_EXIT=0x71
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_ENTRY=0x2c
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEDATEITEM_EXIT=0x2d
[TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_UPDATEPLACEITEM_ENTRY=0x2a
@@ -101,3 +128,5 @@
[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_UPDATEPLACEITEM_EXIT=0x5d
[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_ENTRY=0x62
[TRACE]TRACE_FLOW[0x8A]_SETTINGSCUSTOMITEM_WORKDAYSSETTING_EXIT=0x63
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_ENTRY=0x64
+[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CLOCKSETTINGSVIEW_GETVIEW_EXIT=0x65
--- a/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clocksettingsview/traces/settingscustomitemTraces.h Fri Sep 17 08:29:05 2010 +0300
@@ -1,4 +1,21 @@
-// Created by TraceCompiler 2.2.3
+/*
+* 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:
+* Definition file for class ClockSettingsView.
+*
+*/
+// Created by TraceCompiler 2.2.4
// DO NOT EDIT, CHANGES WILL BE LOST
#ifndef __SETTINGSCUSTOMITEMTRACES_H__
--- a/clock/clockui/clockviewmanager/clockviewmanager.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockviewmanager/clockviewmanager.pro Fri Sep 17 08:29:05 2010 +0300
@@ -51,8 +51,5 @@
clockviewmanager.h \
clockdocloader.h \
clockviewmanagerdefines.h
-
-RESOURCES += \
- ../../data/clock.qrc
# End of file --Don't remove this.
--- a/clock/clockui/clockviews/src/clockmainview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockviews/src/clockmainview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -156,7 +156,7 @@
// Get the alarm's list.
mAlarmList = qobject_cast<HbListView *> (
mDocLoader->findWidget(CLOCK_ALARMLIST));
-
+ mAlarmList->setItemPixmapCacheEnabled(true);
connect(
mAlarmList, SIGNAL(activated(const QModelIndex &)),
this, SLOT(handleActivated(const QModelIndex &)));
--- a/clock/clockui/clockviews/src/clockworldview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockviews/src/clockworldview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -143,7 +143,7 @@
HbStyleLoader::registerFilePath(":/style/hblistviewitem_color.css");
mCityListView->setLayoutName("citylist");
mCityListView->setModel(mCityListModel);
-
+ mCityListView->setItemPixmapCacheEnabled(true);
// Get the toolbar/menu actions.
mAddCityAction = static_cast<HbAction *> (
mDocLoader->findObject("addCityAction"));
--- a/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/clockui/clockwidget/clockwidgetimpl/resource/analogclockwidget.css Fri Sep 17 08:29:05 2010 +0300
@@ -14,7 +14,7 @@
AnalogClockWidget::clock_hour_hand {
size-policy:expanding expanding;
- zvalue: 2;
+ zvalue: 3;
}
AnalogClockWidget::clock_second_hand {
--- a/clock/data/analog/0_qtg_graf_clock_day_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.645" y1="13.752" x2="137.7448" y2="160.6519">
- <stop offset="0" style="stop-color:#B2B2B2"/>
- <stop offset="1" style="stop-color:#4D4D4D"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M88.752,1C137.218,1,176.5,40.287,176.5,88.75c0,48.467-39.281,87.75-87.748,87.75
- C40.285,176.5,1,137.217,1,88.75C1,40.287,40.285,1,88.752,1z"/>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="41.5273" y1="24.771" x2="122.1276" y2="133.9712">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#E6E6E6"/>
- </linearGradient>
- <path fill="url(#SVGID_2_)" d="M88.752,4.352c46.615,0,84.396,37.789,84.396,84.398c0,46.613-37.781,84.398-84.396,84.398
- c-46.614,0-84.4-37.785-84.4-84.398C4.352,42.141,42.138,4.352,88.752,4.352z"/>
- <ellipse fill="#333333" cx="88.75" cy="167.445" rx="3.037" ry="3.105"/>
- <ellipse fill="#333333" cx="88.75" cy="10.164" rx="3.036" ry="3.102"/>
- <ellipse fill="#333333" cx="10.253" cy="88.869" rx="3.036" ry="3.104"/>
- <path fill="#333333" d="M169.939,88.867c0,1.717-1.363,3.105-3.036,3.105c-1.676,0-3.037-1.389-3.037-3.105
- c0-1.715,1.361-3.105,3.037-3.105C168.576,85.762,169.939,87.152,169.939,88.867z"/>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/0_qtg_graf_clock_day_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <polygon fill="#333333" points="79.008,93.75 79.008,83.75 147.008,83.75 147.008,93.75 79.008,93.75 "/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/0_qtg_graf_clock_day_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <rect x="86.26" y="16.057" fill="#333333" width="4.98" height="85"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/0_qtg_graf_clock_night_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.6455" y1="13.7515" x2="137.7448" y2="160.6506">
- <stop offset="0" style="stop-color:#B2B2B2"/>
- <stop offset="1" style="stop-color:#4D4D4D"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M88.752,1C137.219,1,176.5,40.287,176.5,88.75c0,48.467-39.281,87.75-87.748,87.75
- S1,137.216,1,88.75C1,40.287,40.285,1,88.752,1z"/>
- <path fill="#333333" d="M88.752,4.352c46.615,0,84.396,37.789,84.396,84.398c0,46.613-37.781,84.398-84.396,84.398
- c-46.614,0-84.4-37.785-84.4-84.398C4.352,42.141,42.138,4.352,88.752,4.352z"/>
- <ellipse fill="#FFFFFF" cx="88.75" cy="167.445" rx="3.037" ry="3.105"/>
- <ellipse fill="#FFFFFF" cx="88.75" cy="10.164" rx="3.036" ry="3.102"/>
- <ellipse fill="#FFFFFF" cx="10.253" cy="88.869" rx="3.036" ry="3.104"/>
- <path fill="#FFFFFF" d="M169.939,88.867c0,1.717-1.363,3.105-3.036,3.105c-1.676,0-3.037-1.389-3.037-3.105
- c0-1.715,1.361-3.105,3.037-3.105C168.576,85.761,169.939,87.152,169.939,88.867z"/>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/0_qtg_graf_clock_night_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <polygon fill="#FFFFFF" points="79.008,93.75 79.008,83.75 147.008,83.75 147.008,93.75 79.008,93.75 "/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/0_qtg_graf_clock_night_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <rect x="86.26" y="16.057" fill="#FFFFFF" width="4.98" height="85"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_day_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.501px" viewBox="0 0 177.499 177.501" enable-background="new 0 0 177.499 177.501"
- xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#084296" d="M2.75,88.751c0,47.423,38.581,86,86,86c47.419,0,85.999-38.577,85.999-86c0-47.419-38.58-86-85.999-86
- C41.331,2.751,2.75,41.332,2.75,88.751z"/>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="5.8057" x2="88.7495" y2="160.0247">
- <stop offset="0" style="stop-color:#B3DDFF"/>
- <stop offset="1" style="stop-color:#084296"/>
- </linearGradient>
- <circle fill="url(#SVGID_1_)" cx="88.75" cy="88.751" r="84.089"/>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="151.9521" x2="88.7495" y2="26.3789">
- <stop offset="0" style="stop-color:#C4E6FF"/>
- <stop offset="0.5112" style="stop-color:#5AA7E0"/>
- <stop offset="1" style="stop-color:#3366CC"/>
- </linearGradient>
- <path fill="url(#SVGID_2_)" d="M88.75,10.395c-43.205,0-78.355,35.154-78.355,78.356c0,43.206,35.15,78.355,78.355,78.355
- c43.206,0,78.354-35.149,78.354-78.355C167.104,45.549,131.956,10.395,88.75,10.395z M88.704,150.739
- c-34.204,0-62.031-27.827-62.031-62.033c0-34.205,27.827-62.032,62.031-62.032c34.204,0,62.03,27.827,62.03,62.032
- C150.733,122.912,122.907,150.739,88.704,150.739z"/>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="88.7007" y1="-55.3794" x2="88.7007" y2="214.6226">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="0.6517" style="stop-color:#B3DDFF"/>
- </linearGradient>
- <path fill="url(#SVGID_3_)" d="M21.202,88.706c0,37.217,30.28,67.501,67.5,67.501c37.221,0,67.499-30.284,67.499-67.501
- c0-37.221-30.277-67.5-67.499-67.5C51.482,21.206,21.202,51.485,21.202,88.706z"/>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="88.749" y1="10.9746" x2="88.749" y2="168.8922">
- <stop offset="0" style="stop-color:#5AA7E0"/>
- <stop offset="1" style="stop-color:#3366CC"/>
- </linearGradient>
- <path fill="url(#SVGID_4_)" d="M88.75,7.751c-44.663,0-81,36.337-81,81c0,44.665,36.338,81,81,81
- c44.661,0,80.999-36.335,80.999-81C169.749,44.088,133.411,7.751,88.75,7.751z M88.701,158.705c-38.6,0-70-31.4-70-69.999
- s31.401-70.001,70-70.001c38.599,0,69.999,31.402,69.999,70.001S127.3,158.705,88.701,158.705z"/>
- </g>
- <g opacity="0.8">
- <rect x="23.917" y="86.251" fill="#084296" width="5" height="5"/>
- <rect x="148.583" y="86.251" fill="#084296" width="5" height="5"/>
- <rect x="86.25" y="23.917" fill="#084296" width="5" height="5.002"/>
- <rect x="86.25" y="148.583" fill="#084296" width="5" height="5.002"/>
- </g>
- </g>
- <rect fill="none" width="177.499" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_day_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.501px" viewBox="0 0 177.499 177.501" enable-background="new 0 0 177.499 177.501"
- xml:space="preserve">
-<g>
- <polygon opacity="0.4" fill="#FFFFFF" points="78.289,97.629 78.298,95.924 78.369,81.788 78.378,80.104 80.05,80.306
- 128.295,86.129 129.622,86.289 129.615,87.625 129.604,89.989 129.598,91.31 128.286,91.472 79.98,97.42 78.289,97.629 "/>
- <polygon fill="#003B91" points="79.869,81.794 128.116,87.617 128.103,89.982 79.799,95.93 "/>
- <rect fill="none" width="177.499" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_day_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.501px" viewBox="0 0 177.5 177.501" enable-background="new 0 0 177.5 177.501" xml:space="preserve">
-<g>
- <polygon opacity="0.4" fill="#FFFFFF" points="94.746,99.281 93.169,99.281 84.333,99.281 82.756,99.281 82.834,97.705
- 86.071,32.763 86.142,31.34 87.567,31.338 89.93,31.336 91.36,31.336 91.431,32.761 94.667,97.705 94.746,99.281 "/>
- <polygon fill="#003B91" points="93.169,97.78 89.933,32.837 87.568,32.838 84.332,97.781 "/>
- <rect fill="none" width="177.5" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_day_overlay.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.501px" viewBox="0 0 177.5 177.501" enable-background="new 0 0 177.5 177.501" xml:space="preserve">
-<g>
-
- <radialGradient id="SVGID_1_" cx="-344.9858" cy="43.5625" r="49.1408" gradientTransform="matrix(1.9111 0 0 1.9111 748.0065 -56.5779)" gradientUnits="userSpaceOnUse">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#005FA1"/>
- </radialGradient>
- <circle opacity="0.4" fill="url(#SVGID_1_)" cx="88.511" cy="88.751" r="67.5"/>
- <rect fill="none" width="177.5" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_night_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.501px" viewBox="0 0 177.499 177.501" enable-background="new 0 0 177.499 177.501"
- xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#03214A" d="M2.75,88.751c0,47.423,38.58,86,86,86c47.419,0,85.999-38.577,85.999-86c0-47.419-38.58-86-85.999-86
- C41.33,2.751,2.75,41.332,2.75,88.751z"/>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="5.8057" x2="88.7495" y2="160.0247">
- <stop offset="0" style="stop-color:#7C98B0"/>
- <stop offset="1" style="stop-color:#010C1C"/>
- </linearGradient>
- <circle fill="url(#SVGID_1_)" cx="88.75" cy="88.751" r="84.089"/>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="151.9521" x2="88.7495" y2="26.3789">
- <stop offset="0" style="stop-color:#6A7A85"/>
- <stop offset="0.5112" style="stop-color:#203B4F"/>
- <stop offset="1" style="stop-color:#04070F"/>
- </linearGradient>
- <path fill="url(#SVGID_2_)" d="M88.75,10.395c-43.205,0-78.355,35.154-78.355,78.356c0,43.206,35.15,78.355,78.355,78.355
- s78.354-35.149,78.354-78.355C167.104,45.549,131.955,10.395,88.75,10.395z M88.703,150.739
- c-34.204,0-62.031-27.827-62.031-62.033c0-34.205,27.827-62.032,62.031-62.032s62.03,27.827,62.03,62.032
- C150.733,122.912,122.907,150.739,88.703,150.739z"/>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="88.7007" y1="-55.3794" x2="88.7007" y2="214.6226">
- <stop offset="0" style="stop-color:#6E8496"/>
- <stop offset="0.6517" style="stop-color:#2B353D"/>
- <stop offset="1" style="stop-color:#0A2136"/>
- </linearGradient>
- <path fill="url(#SVGID_3_)" d="M21.201,88.706c0,37.217,30.28,67.501,67.5,67.501c37.222,0,67.499-30.284,67.499-67.501
- c0-37.221-30.277-67.5-67.499-67.5C51.481,21.206,21.201,51.485,21.201,88.706z"/>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="88.7485" y1="10.9746" x2="88.7485" y2="168.8922">
- <stop offset="0" style="stop-color:#2C4B6E"/>
- <stop offset="1" style="stop-color:#101E3D"/>
- </linearGradient>
- <path fill="url(#SVGID_4_)" d="M88.75,7.751c-44.663,0-81.001,36.337-81.001,81c0,44.665,36.338,81,81.001,81
- c44.661,0,80.999-36.335,80.999-81C169.749,44.088,133.411,7.751,88.75,7.751z M88.701,158.705
- c-38.6,0-70.001-31.4-70.001-69.999s31.401-70.001,70.001-70.001c38.599,0,69.999,31.402,69.999,70.001
- S127.3,158.705,88.701,158.705z"/>
- </g>
- <g opacity="0.6">
- <rect x="23.916" y="86.251" fill="#FFFFFF" width="5" height="5"/>
- <rect x="148.583" y="86.251" fill="#FFFFFF" width="5" height="5"/>
- <rect x="86.25" y="23.917" fill="#FFFFFF" width="5" height="5.002"/>
- <rect x="86.25" y="148.583" fill="#FFFFFF" width="5" height="5.002"/>
- </g>
- </g>
- <rect fill="none" width="177.499" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_night_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.501px" viewBox="0 0 177.499 177.501" enable-background="new 0 0 177.499 177.501"
- xml:space="preserve">
-<g>
- <polygon opacity="0.4" points="78.291,97.63 78.3,95.924 78.369,81.786 78.377,80.103 80.047,80.305 128.296,86.129
- 129.624,86.289 129.614,87.626 129.602,89.991 129.595,91.31 128.282,91.472 79.98,97.421 78.291,97.63 "/>
- <polygon fill="#FFFFFF" points="79.868,81.794 128.115,87.617 128.103,89.982 79.799,95.93 "/>
- <rect fill="none" width="177.499" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_night_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.502px" viewBox="0 0 177.499 177.502" enable-background="new 0 0 177.499 177.502"
- xml:space="preserve">
-<g>
- <g>
- <polygon opacity="0.4" points="94.746,99.281 93.17,99.281 84.332,99.281 82.756,99.281 82.836,97.707 86.07,32.764 86.141,31.34
- 87.564,31.34 89.931,31.337 91.359,31.335 91.43,32.761 94.667,97.707 94.746,99.281 "/>
- <polygon fill="#FFFFFF" points="93.17,97.781 89.934,32.837 87.568,32.838 84.332,97.781 "/>
- </g>
- <rect fill="none" width="177.499" height="177.502"/>
-</g>
-</svg>
--- a/clock/data/analog/1_qtg_graf_clock_night_overlay.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.499px" height="177.502px" viewBox="0 0 177.499 177.502" enable-background="new 0 0 177.499 177.502"
- xml:space="preserve">
-<g>
-
- <radialGradient id="SVGID_1_" cx="-345.8276" cy="44.8008" r="51.017" gradientTransform="matrix(1.9111 0 0 1.9111 747.8325 -55.9471)" gradientUnits="userSpaceOnUse">
- <stop offset="0" style="stop-color:#F0F7FF"/>
- <stop offset="1" style="stop-color:#005BB0"/>
- </radialGradient>
- <circle opacity="0.5" fill="url(#SVGID_1_)" cx="88.512" cy="88.167" r="67.5"/>
- <rect y="-0.584" fill="none" width="177.5" height="177.501"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_day_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#1A1A1A" d="M12.75,169.25c-2.486,0-4.5-2.014-4.5-4.5l0,0v-152c0-2.486,2.014-4.5,4.5-4.5l0,0h152
- c2.486,0,4.5,2.014,4.5,4.5l0,0v152c0,2.486-2.014,4.5-4.5,4.5l0,0H12.75L12.75,169.25z"/>
- </g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="88.0054" y1="9.2539" x2="89.5053" y2="169.2539">
- <stop offset="0" style="stop-color:#F2F2F2"/>
- <stop offset="0.0047" style="stop-color:#EFEFEF"/>
- <stop offset="0.0451" style="stop-color:#D4D4D4"/>
- <stop offset="0.0908" style="stop-color:#BEBEBE"/>
- <stop offset="0.1449" style="stop-color:#ADADAD"/>
- <stop offset="0.2117" style="stop-color:#A2A2A2"/>
- <stop offset="0.3055" style="stop-color:#9B9B9B"/>
- <stop offset="0.5659" style="stop-color:#999999"/>
- <stop offset="1" style="stop-color:#333333"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M168.75,164.75c0,2.209-1.791,4-4,4h-152c-2.209,0-4-1.791-4-4v-152c0-2.209,1.791-4,4-4h152
- c2.209,0,4,1.791,4,4V164.75z"/>
- <g>
- <g>
- <path d="M122.677,30.609v-0.984l0.536-0.086c0.448-0.086,0.569-0.587,0.569-1.381v-6.063h-1.623v-1.157h0.38
- c0.88,0,1.484-0.294,1.899-1.208h1.278v8.428c0,0.794,0.139,1.295,0.587,1.381l0.553,0.086v0.984H122.677z"/>
- </g>
- <g>
- <path d="M147.585,56.113v-0.761c0-2.228,1.02-3.212,2.038-4.041c1.468-1.157,2.159-2.038,2.159-3.333
- c0-0.864-0.415-1.744-1.382-1.744c-1.243,0-1.658,0.897-1.658,1.313c0,0.275,0.155,0.466,0.467,0.518
- c0.431,0.052,0.76,0.346,0.76,0.933c0,0.57-0.484,1.122-1.158,1.122c-0.914,0-1.277-0.914-1.277-2.123
- c0-1.814,1.572-2.885,3.265-2.885c1.519,0,3.212,0.984,3.212,2.953c0,2.418-1.434,3.368-2.469,3.834
- c-0.847,0.414-2.057,1.02-2.59,2.158l0.033,0.053c0.5-0.415,0.984-0.587,1.555-0.587c0.381,0,0.639,0.069,0.914,0.189
- c0.363,0.138,0.674,0.276,1.072,0.276c0.534,0,0.586-0.691,0.586-1.555h1.02v1.002c0,1.865-0.709,2.78-2.106,2.78
- c-0.571,0-1.02-0.207-1.33-0.38c-0.483-0.275-0.951-0.466-1.399-0.466c-0.344,0-0.621,0.241-0.674,0.743H147.585z"/>
- </g>
- <g>
- <path d="M85.633,162.354c0-3.592,1.433-5.992,4.042-5.992c1.365,0,2.626,0.553,2.626,2.211c0,1.035-0.518,1.813-1.297,1.83
- c-0.689,0.018-1.173-0.432-1.173-1.002c0-0.569,0.414-0.846,0.777-0.897c0.258-0.034,0.467-0.207,0.467-0.415
- c0-0.224-0.396-0.621-1.193-0.621c-1.485,0-2.176,2.262-2.02,4.248c0.363-0.553,0.966-0.932,1.848-0.932
- c1.365,0,2.833,0.967,2.833,3.143c0,2.729-1.623,3.54-3.437,3.54C86.738,167.466,85.633,165.324,85.633,162.354z M88,164.099
- c0,1.348,0.466,1.969,1.243,1.969s1.244-0.621,1.244-1.969c0-1.347-0.467-1.969-1.244-1.969S88,162.752,88,164.099z"/>
- </g>
- <g>
- <path d="M160.201,88.054c0.621-0.087,1.348-0.656,1.348-1.969c0-1.209-0.432-2.038-1.605-2.038
- c-1.191,0-1.571,0.897-1.571,1.209c0,0.311,0.205,0.466,0.446,0.5c0.33,0.035,0.743,0.363,0.743,0.95s-0.482,1.123-1.173,1.123
- c-0.881,0-1.227-0.794-1.227-2.003c0-1.814,1.744-2.885,3.229-2.885c1.658,0,3.42,0.863,3.42,2.901
- c0,1.382-0.777,2.142-1.33,2.436v0.052c0.76,0.259,1.469,1.329,1.469,2.572c0,2.039-1.469,3.144-3.162,3.144
- c-1.76,0-3.625-0.604-3.625-2.78c0-1.07,0.363-1.797,1.26-1.797c0.76,0,1.105,0.467,1.105,0.951
- c0,0.448-0.275,0.897-0.517,1.035c-0.192,0.121-0.313,0.295-0.313,0.449c0,0.312,0.519,0.847,1.382,0.847
- c0.674,0,1.555-0.38,1.555-1.744c0-1.71-0.726-1.9-1.434-1.9V88.054z"/>
- </g>
- <g>
- <path d="M147.158,125.186l4.024-6.459h1.778v6.459h1.484v1.295h-1.484v0.674c0,0.795,0.137,1.295,0.587,1.381l0.534,0.087
- v0.984h-4.109v-0.984l0.484-0.087c0.43-0.086,0.57-0.586,0.57-1.381v-0.674h-3.869V125.186z M151.027,125.186v-3.834
- l-2.385,3.834H151.027z"/>
- </g>
- <g>
- <path d="M121.576,151.932l0.346-5.388h5.543l-0.104,1.709h-4.334l-0.139,2.142c0.673-0.414,1.348-0.57,2.055-0.57
- c1.676,0,3.006,1.089,3.006,3.697c0,2.745-1.606,4.006-3.282,4.006c-1.64,0-3.505-0.604-3.505-2.798
- c0-1.14,0.345-1.779,1.26-1.779c0.76,0,1.089,0.468,1.089,1.002c0,0.397-0.191,0.777-0.467,0.984
- c-0.155,0.122-0.259,0.312-0.259,0.501c0,0.19,0.484,0.795,1.209,0.795c1.415,0,1.623-1.364,1.623-2.66
- c0-0.846-0.225-2.383-1.484-2.383c-0.588,0-1.02,0.138-1.469,0.742H121.576z"/>
- </g>
- <g>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="84.3135" y1="9.2881" x2="84.147" y2="20.7875">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="0.0074" style="stop-color:#F6F6F6"/>
- <stop offset="0.0477" style="stop-color:#C8C8C8"/>
- <stop offset="0.0931" style="stop-color:#9D9D9D"/>
- <stop offset="0.1419" style="stop-color:#777777"/>
- <stop offset="0.195" style="stop-color:#575757"/>
- <stop offset="0.2537" style="stop-color:#3B3B3B"/>
- <stop offset="0.32" style="stop-color:#252525"/>
- <stop offset="0.3974" style="stop-color:#141414"/>
- <stop offset="0.4931" style="stop-color:#090909"/>
- <stop offset="0.6274" style="stop-color:#020202"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <path fill="url(#SVGID_2_)" d="M82.384,21.029v-0.984l0.536-0.086c0.449-0.086,0.569-0.588,0.569-1.382v-6.062h-1.624v-1.157
- h0.381c0.88,0,1.485-0.294,1.9-1.209h1.277v8.428c0,0.794,0.14,1.296,0.588,1.382l0.552,0.086v0.984H82.384z"/>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="92.3379" y1="9.4043" x2="92.1714" y2="20.9038">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="0.0074" style="stop-color:#F6F6F6"/>
- <stop offset="0.0477" style="stop-color:#C8C8C8"/>
- <stop offset="0.0931" style="stop-color:#9D9D9D"/>
- <stop offset="0.1419" style="stop-color:#777777"/>
- <stop offset="0.195" style="stop-color:#575757"/>
- <stop offset="0.2537" style="stop-color:#3B3B3B"/>
- <stop offset="0.32" style="stop-color:#252525"/>
- <stop offset="0.3974" style="stop-color:#141414"/>
- <stop offset="0.4931" style="stop-color:#090909"/>
- <stop offset="0.6274" style="stop-color:#020202"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <path fill="url(#SVGID_3_)" d="M89.001,21.029v-0.76c0-2.228,1.02-3.212,2.038-4.041c1.468-1.157,2.16-2.039,2.16-3.334
- c0-0.863-0.415-1.744-1.383-1.744c-1.243,0-1.658,0.898-1.658,1.313c0,0.277,0.155,0.467,0.467,0.52
- c0.431,0.051,0.76,0.345,0.76,0.932c0,0.57-0.484,1.123-1.157,1.123c-0.916,0-1.278-0.916-1.278-2.125
- c0-1.813,1.572-2.883,3.266-2.883c1.519,0,3.212,0.984,3.212,2.953c0,2.417-1.435,3.367-2.47,3.833
- c-0.847,0.415-2.057,1.019-2.59,2.159l0.033,0.052c0.5-0.415,0.984-0.587,1.555-0.587c0.381,0,0.639,0.068,0.914,0.189
- c0.363,0.138,0.674,0.277,1.072,0.277c0.534,0,0.586-0.691,0.586-1.556h1.02v1.002c0,1.866-0.709,2.78-2.105,2.78
- c-0.572,0-1.02-0.207-1.331-0.38c-0.483-0.276-0.95-0.466-1.399-0.466c-0.344,0-0.621,0.242-0.673,0.742H89.001z"/>
- </g>
- <g>
- <path d="M46.167,30.611v-0.984l0.537-0.087c0.447-0.087,0.568-0.587,0.568-1.382v-6.061h-1.623v-1.158h0.38
- c0.881,0,1.485-0.294,1.901-1.209h1.277v8.428c0,0.795,0.138,1.295,0.587,1.382l0.552,0.087v0.984H46.167z"/>
- <path d="M52.993,30.611v-0.984l0.536-0.087c0.449-0.087,0.569-0.587,0.569-1.382v-6.061h-1.623v-1.158h0.38
- c0.88,0,1.485-0.294,1.899-1.209h1.279v8.428c0,0.795,0.138,1.295,0.586,1.382l0.553,0.087v0.984H52.993z"/>
- </g>
- <g>
- <path d="M19.489,56.113v-0.984l0.536-0.086c0.449-0.086,0.569-0.588,0.569-1.382V47.6H18.97v-1.157h0.381
- c0.88,0,1.485-0.294,1.899-1.209h1.277v8.428c0,0.794,0.14,1.296,0.588,1.382l0.553,0.086v0.984H19.489z"/>
- <path d="M25.848,50.621c0-3.367,1.52-5.508,3.679-5.508s3.679,2.105,3.679,5.508c0,3.385-1.157,5.596-3.679,5.596
- C26.988,56.217,25.848,54.006,25.848,50.621z M29.526,55.111c1.037,0,1.243-1.398,1.243-4.49c0-3.437-0.207-4.403-1.243-4.403
- s-1.245,0.967-1.245,4.403C28.282,53.713,28.49,55.111,29.526,55.111z"/>
- </g>
- <g>
- <path d="M12.803,91.594c0-0.812,0.312-1.588,1.021-1.588c0.724,0,1.087,0.465,1.087,0.845c0,0.381-0.139,0.691-0.363,0.882
- c-0.189,0.154-0.241,0.345-0.241,0.553c0,0.224,0.483,0.674,1.365,0.674c1.485,0,1.761-2.28,1.606-4.197
- c-0.433,0.57-1.088,0.863-1.848,0.863c-1.279,0-2.832-0.984-2.832-3.143c0-2.729,1.57-3.541,3.229-3.541
- c2.4,0,3.903,2.142,3.903,5.612c0,3.714-1.642,5.492-3.991,5.492C14.29,94.046,12.803,93.113,12.803,91.594z M14.652,86.24
- c0,1.347,0.465,2.003,1.243,2.003c0.761,0,1.226-0.656,1.226-2.003c0-1.348-0.465-2.193-1.226-2.193
- C15.084,84.047,14.652,84.893,14.652,86.24z"/>
- </g>
- <g>
- <path d="M29.443,121.285c0,1.209-0.605,1.951-1.329,2.504c1.189,0.536,1.76,1.711,1.76,2.781c0,2.4-1.918,3.143-3.868,3.143
- c-1.487,0-3.644-0.432-3.644-2.884c0-1.157,0.726-2.228,1.589-2.746c-0.778-0.708-1.261-1.382-1.261-2.626
- c0-1.813,1.691-2.848,3.505-2.848C27.542,118.609,29.443,119.334,29.443,121.285z M27.75,126.881c0-0.69-0.863-1.277-2.522-1.9
- c-0.847,0.208-1.277,0.934-1.277,1.572c0,1.227,0.966,1.762,2.106,1.762C26.972,128.314,27.75,127.797,27.75,126.881z
- M24.744,120.923c0,0.64,0.657,1.295,1.399,1.657c0.744-0.362,1.468-1.018,1.468-1.623c0-0.742-0.743-1.243-1.468-1.243
- C25.557,119.714,24.744,120.076,24.744,120.923z"/>
- </g>
- <g>
- <path d="M52.209,157.459h-2.367v-0.449c0-3.23,1.812-6.528,2.884-8.204l-0.087-0.052c-0.309,0.035-0.812-0.156-1.172-0.293
- c-0.363-0.121-0.709-0.174-1.038-0.174c-0.708,0-1.33,0.848-1.33,2.66H47.58v-4.404h1.037c0.035,0.346,0.173,0.536,0.293,0.536
- c0.172,0,0.57-0.173,0.829-0.294c0.432-0.207,1.002-0.328,1.675-0.328c0.554,0,0.968,0.189,1.28,0.346
- c0.309,0.173,0.568,0.346,0.827,0.346c0.208,0,0.346-0.053,0.466-0.156c0.104-0.086,0.173-0.224,0.173-0.414h1.105v0.311
- c0,1.504-0.778,2.711-1.537,4.146c-0.742,1.45-1.519,3.143-1.519,5.647V157.459z"/>
- </g>
- </g>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_day_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#333333" d="M102.613,79.734l-13.813,9l13.886,9.125l34.863-9.125L102.613,79.734z M103.32,91.297
- c-2.762,0-5-1.119-5-2.5s2.238-2.5,5-2.5s5,1.119,5,2.5S106.082,91.297,103.32,91.297z M115.737,90.797c-1.933,0-3.5-0.895-3.5-2
- c0-1.104,1.567-2,3.5-2s3.5,0.896,3.5,2C119.237,89.902,117.67,90.797,115.737,90.797z M124.778,90.297c-1.104,0-2-0.671-2-1.5
- s0.896-1.5,2-1.5s2,0.671,2,1.5S125.883,90.297,124.778,90.297z"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_day_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#333333" d="M88.766,23.693L81.641,68.57l7.125,20.123l7-20.018L88.766,23.693z M88.703,41.006c0.553,0,1,0.447,1,1
- c0,0.552-0.447,1-1,1s-1-0.448-1-1C87.703,41.453,88.15,41.006,88.703,41.006z M88.703,45.881c0.828,0,1.5,0.895,1.5,2
- c0,1.104-0.672,2-1.5,2s-1.5-0.896-1.5-2C87.203,46.775,87.875,45.881,88.703,45.881z M88.703,53.006c1.104,0,2,1.565,2,3.5
- c0,1.934-0.896,3.5-2,3.5s-2-1.566-2-3.5C86.703,54.571,87.6,53.006,88.703,53.006z M88.703,72.756c-1.381,0-2.5-2.239-2.5-5
- c0-2.762,1.119-5,2.5-5s2.5,2.238,2.5,5C91.203,70.517,90.084,72.756,88.703,72.756z"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_day_sec.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <polygon fill="#00FF00" points="89.75,97.594 88.75,88.766 87.75,97.594 88.75,162.787 "/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_night_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#E6E6E6" d="M12.75,169.25c-2.486,0-4.5-2.014-4.5-4.5l0,0v-152c0-2.486,2.014-4.5,4.5-4.5l0,0h152
- c2.486,0,4.5,2.014,4.5,4.5l0,0v152c0,2.486-2.014,4.5-4.5,4.5l0,0H12.75L12.75,169.25z"/>
- </g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="88.0044" y1="9.2529" x2="89.5043" y2="169.2529">
- <stop offset="0" style="stop-color:#B2B2B2"/>
- <stop offset="0.0263" style="stop-color:#909090"/>
- <stop offset="0.0559" style="stop-color:#707070"/>
- <stop offset="0.0895" style="stop-color:#555555"/>
- <stop offset="0.1274" style="stop-color:#3F3F3F"/>
- <stop offset="0.1717" style="stop-color:#2E2E2E"/>
- <stop offset="0.2264" style="stop-color:#222222"/>
- <stop offset="0.3032" style="stop-color:#1B1B1B"/>
- <stop offset="0.5165" style="stop-color:#1A1A1A"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M168.75,164.75c0,2.209-1.791,4-4,4h-152c-2.209,0-4-1.791-4-4v-152c0-2.209,1.791-4,4-4h152
- c2.209,0,4,1.791,4,4V164.75z"/>
- <g>
- <g>
- <path fill="#F2F2F2" d="M122.677,30.61v-0.984l0.535-0.087c0.449-0.086,0.57-0.587,0.57-1.381v-6.062h-1.623v-1.158h0.379
- c0.881,0,1.485-0.294,1.9-1.208h1.278v8.428c0,0.794,0.138,1.295,0.587,1.381l0.553,0.087v0.984H122.677z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M147.585,56.113v-0.761c0-2.228,1.02-3.212,2.037-4.041c1.469-1.157,2.16-2.038,2.16-3.333
- c0-0.864-0.415-1.744-1.383-1.744c-1.242,0-1.657,0.897-1.657,1.313c0,0.276,0.155,0.466,0.466,0.519
- c0.432,0.051,0.76,0.345,0.76,0.932c0,0.57-0.483,1.123-1.157,1.123c-0.915,0-1.278-0.915-1.278-2.124
- c0-1.813,1.572-2.884,3.266-2.884c1.519,0,3.212,0.984,3.212,2.953c0,2.417-1.435,3.367-2.47,3.833
- c-0.846,0.415-2.056,1.02-2.59,2.159l0.033,0.052c0.501-0.415,0.984-0.587,1.556-0.587c0.38,0,0.638,0.069,0.914,0.189
- c0.362,0.138,0.673,0.277,1.071,0.277c0.535,0,0.586-0.691,0.586-1.556h1.02v1.002c0,1.866-0.708,2.78-2.105,2.78
- c-0.571,0-1.02-0.207-1.33-0.38c-0.484-0.275-0.951-0.466-1.4-0.466c-0.344,0-0.621,0.242-0.674,0.743H147.585z"/>
- </g>
- <g>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="89.3994" y1="156.1025" x2="88.8994" y2="167.2686">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="0.3726" style="stop-color:#FDFDFD"/>
- <stop offset="0.5069" style="stop-color:#F6F6F6"/>
- <stop offset="0.6026" style="stop-color:#EBEBEB"/>
- <stop offset="0.68" style="stop-color:#DADADA"/>
- <stop offset="0.7463" style="stop-color:#C4C4C4"/>
- <stop offset="0.805" style="stop-color:#A8A8A8"/>
- <stop offset="0.8581" style="stop-color:#888888"/>
- <stop offset="0.9069" style="stop-color:#626262"/>
- <stop offset="0.9523" style="stop-color:#373737"/>
- <stop offset="0.9926" style="stop-color:#090909"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <path fill="url(#SVGID_2_)" d="M85.633,162.354c0-3.593,1.433-5.992,4.042-5.992c1.364,0,2.626,0.552,2.626,2.21
- c0,1.036-0.518,1.813-1.297,1.83c-0.689,0.018-1.173-0.432-1.173-1.001c0-0.57,0.413-0.847,0.776-0.898
- c0.259-0.034,0.467-0.207,0.467-0.414c0-0.225-0.396-0.622-1.192-0.622c-1.485,0-2.176,2.262-2.02,4.248
- c0.363-0.553,0.966-0.932,1.848-0.932c1.364,0,2.833,0.967,2.833,3.143c0,2.729-1.623,3.54-3.438,3.54
- C86.738,167.466,85.633,165.325,85.633,162.354z M88,164.099c0,1.348,0.466,1.969,1.243,1.969s1.243-0.621,1.243-1.969
- c0-1.347-0.467-1.969-1.243-1.969S88,162.752,88,164.099z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M160.201,88.054c0.622-0.087,1.348-0.656,1.348-1.969c0-1.209-0.432-2.038-1.605-2.038
- c-1.191,0-1.57,0.897-1.57,1.209c0,0.311,0.205,0.466,0.446,0.5c0.329,0.035,0.743,0.363,0.743,0.95s-0.482,1.123-1.173,1.123
- c-0.882,0-1.227-0.794-1.227-2.003c0-1.813,1.743-2.884,3.229-2.884c1.658,0,3.42,0.862,3.42,2.9
- c0,1.382-0.777,2.142-1.33,2.436v0.052c0.76,0.259,1.468,1.329,1.468,2.573c0,2.038-1.468,3.143-3.161,3.143
- c-1.761,0-3.625-0.604-3.625-2.78c0-1.07,0.362-1.796,1.26-1.796c0.759,0,1.105,0.467,1.105,0.95
- c0,0.448-0.276,0.897-0.517,1.036c-0.192,0.121-0.313,0.294-0.313,0.449c0,0.311,0.518,0.846,1.382,0.846
- c0.674,0,1.554-0.38,1.554-1.744c0-1.71-0.725-1.9-1.434-1.9V88.054z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M147.158,125.186l4.025-6.459h1.777v6.459h1.484v1.295h-1.484v0.674c0,0.795,0.138,1.295,0.588,1.382
- l0.534,0.086v0.984h-4.109v-0.984l0.483-0.086c0.431-0.087,0.57-0.587,0.57-1.382v-0.674h-3.869V125.186z M151.027,125.186
- v-3.834l-2.384,3.834H151.027z"/>
- </g>
- <g>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="124.5562" y1="144.8125" x2="124.5562" y2="158.8125">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#CCCCCC"/>
- </linearGradient>
- <path fill="url(#SVGID_3_)" d="M121.576,151.933l0.346-5.389h5.544l-0.104,1.709h-4.334l-0.138,2.142
- c0.673-0.413,1.347-0.57,2.054-0.57c1.676,0,3.006,1.089,3.006,3.697c0,2.745-1.605,4.006-3.281,4.006
- c-1.641,0-3.505-0.604-3.505-2.798c0-1.14,0.345-1.779,1.26-1.779c0.759,0,1.089,0.468,1.089,1.002
- c0,0.397-0.191,0.777-0.467,0.984c-0.155,0.122-0.26,0.312-0.26,0.501c0,0.19,0.484,0.795,1.209,0.795
- c1.416,0,1.623-1.364,1.623-2.659c0-0.847-0.225-2.384-1.484-2.384c-0.588,0-1.02,0.138-1.469,0.743H121.576z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M82.384,21.03v-0.984l0.536-0.087c0.449-0.086,0.569-0.587,0.569-1.382v-6.062h-1.624v-1.157h0.381
- c0.88,0,1.485-0.294,1.9-1.209h1.277v8.428c0,0.795,0.14,1.296,0.588,1.382l0.552,0.087v0.984H82.384z"/>
- <path fill="#F2F2F2" d="M89.001,21.03V20.27c0-2.228,1.02-3.212,2.037-4.041c1.469-1.157,2.16-2.038,2.16-3.333
- c0-0.864-0.414-1.744-1.382-1.744c-1.243,0-1.658,0.897-1.658,1.313c0,0.276,0.155,0.466,0.467,0.519
- c0.431,0.051,0.759,0.345,0.759,0.932c0,0.57-0.483,1.123-1.156,1.123c-0.916,0-1.279-0.915-1.279-2.124
- c0-1.813,1.572-2.884,3.265-2.884c1.52,0,3.213,0.984,3.213,2.953c0,2.417-1.436,3.367-2.471,3.833
- c-0.846,0.415-2.056,1.02-2.59,2.159l0.033,0.052c0.501-0.415,0.984-0.587,1.556-0.587c0.38,0,0.639,0.069,0.914,0.189
- c0.363,0.138,0.674,0.277,1.071,0.277c0.535,0,0.587-0.691,0.587-1.556h1.02v1.002c0,1.866-0.709,2.78-2.106,2.78
- c-0.571,0-1.02-0.207-1.33-0.38c-0.484-0.275-0.951-0.466-1.4-0.466c-0.344,0-0.621,0.242-0.672,0.743H89.001z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M46.167,30.611v-0.984l0.537-0.087c0.447-0.086,0.568-0.587,0.568-1.381v-6.062h-1.623v-1.158h0.38
- c0.881,0,1.485-0.294,1.901-1.208h1.277v8.428c0,0.794,0.138,1.295,0.587,1.381l0.552,0.087v0.984H46.167z"/>
- <path fill="#F2F2F2" d="M52.993,30.611v-0.984l0.536-0.087c0.449-0.086,0.569-0.587,0.569-1.381v-6.062h-1.623v-1.158h0.38
- c0.88,0,1.485-0.294,1.899-1.208h1.279v8.428c0,0.794,0.138,1.295,0.586,1.381l0.553,0.087v0.984H52.993z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M19.489,56.114V55.13l0.536-0.087c0.449-0.086,0.569-0.587,0.569-1.382V47.6H18.97v-1.157h0.381
- c0.88,0,1.485-0.294,1.899-1.209h1.277v8.428c0,0.795,0.14,1.296,0.588,1.382l0.553,0.087v0.984H19.489z"/>
- <path fill="#F2F2F2" d="M25.848,50.622c0-3.368,1.52-5.509,3.679-5.509s3.679,2.106,3.679,5.509
- c0,3.384-1.157,5.595-3.679,5.595C26.988,56.217,25.848,54.006,25.848,50.622z M29.526,55.112c1.037,0,1.243-1.399,1.243-4.49
- c0-3.438-0.207-4.404-1.243-4.404s-1.245,0.967-1.245,4.404C28.282,53.713,28.49,55.112,29.526,55.112z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M12.803,91.595c0-0.813,0.312-1.589,1.021-1.589c0.724,0,1.087,0.466,1.087,0.845
- c0,0.381-0.139,0.691-0.363,0.882c-0.189,0.155-0.241,0.345-0.241,0.553c0,0.224,0.483,0.674,1.365,0.674
- c1.485,0,1.761-2.28,1.606-4.197c-0.433,0.57-1.088,0.863-1.848,0.863c-1.279,0-2.832-0.984-2.832-3.143
- c0-2.729,1.57-3.54,3.229-3.54c2.4,0,3.903,2.141,3.903,5.611c0,3.714-1.642,5.492-3.991,5.492
- C14.29,94.046,12.803,93.114,12.803,91.595z M14.652,86.24c0,1.347,0.465,2.003,1.243,2.003c0.761,0,1.226-0.656,1.226-2.003
- s-0.465-2.193-1.226-2.193C15.084,84.047,14.652,84.894,14.652,86.24z"/>
- </g>
- <g>
- <path fill="#F2F2F2" d="M29.443,121.285c0,1.209-0.605,1.951-1.329,2.504c1.189,0.536,1.76,1.711,1.76,2.781
- c0,2.4-1.918,3.143-3.868,3.143c-1.487,0-3.644-0.432-3.644-2.884c0-1.156,0.726-2.228,1.589-2.746
- c-0.778-0.708-1.261-1.381-1.261-2.625c0-1.813,1.691-2.849,3.505-2.849C27.542,118.609,29.443,119.334,29.443,121.285z
- M27.75,126.881c0-0.69-0.863-1.277-2.522-1.899c-0.847,0.207-1.277,0.933-1.277,1.571c0,1.227,0.966,1.762,2.106,1.762
- C26.972,128.314,27.75,127.797,27.75,126.881z M24.744,120.923c0,0.64,0.657,1.295,1.399,1.657
- c0.744-0.362,1.468-1.018,1.468-1.623c0-0.742-0.743-1.243-1.468-1.243C25.557,119.714,24.744,120.077,24.744,120.923z"/>
- </g>
- <g>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="51.4224" y1="144.8125" x2="51.4224" y2="158.8125">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#CCCCCC"/>
- </linearGradient>
- <path fill="url(#SVGID_4_)" d="M52.209,157.459h-2.367v-0.449c0-3.229,1.812-6.528,2.884-8.204l-0.087-0.052
- c-0.309,0.035-0.812-0.155-1.172-0.293c-0.363-0.121-0.709-0.173-1.038-0.173c-0.708,0-1.33,0.847-1.33,2.66H47.58v-4.404
- h1.037c0.035,0.346,0.173,0.535,0.293,0.535c0.172,0,0.57-0.173,0.829-0.294c0.432-0.206,1.002-0.328,1.675-0.328
- c0.554,0,0.968,0.19,1.28,0.346c0.309,0.173,0.568,0.346,0.827,0.346c0.208,0,0.346-0.053,0.466-0.155
- c0.104-0.087,0.173-0.225,0.173-0.414h1.105v0.311c0,1.503-0.778,2.711-1.537,4.145c-0.742,1.451-1.519,3.143-1.519,5.647
- V157.459z"/>
- </g>
- </g>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_night_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#F2F2F2" d="M102.597,79.75l-13.813,9l13.885,9.125l34.863-9.125L102.597,79.75z M103.304,91.313
- c-2.762,0-5-1.119-5-2.5s2.238-2.5,5-2.5s5,1.119,5,2.5S106.066,91.313,103.304,91.313z M115.722,90.813
- c-1.934,0-3.5-0.895-3.5-2c0-1.104,1.566-2,3.5-2c1.932,0,3.5,0.896,3.5,2C119.222,89.918,117.654,90.813,115.722,90.813z
- M124.763,90.313c-1.105,0-2-0.671-2-1.5s0.895-1.5,2-1.5c1.104,0,2,0.671,2,1.5S125.867,90.313,124.763,90.313z"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_night_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <path fill="#F2F2F2" d="M88.766,23.693L81.641,68.57l7.125,20.123l7-20.018L88.766,23.693z M88.703,41.006c0.553,0,1,0.447,1,1
- c0,0.552-0.447,1-1,1s-1-0.448-1-1C87.703,41.453,88.15,41.006,88.703,41.006z M88.703,45.881c0.828,0,1.5,0.896,1.5,2
- s-0.671,2-1.5,2s-1.5-0.896-1.5-2S87.875,45.881,88.703,45.881z M88.703,53.006c1.104,0,2,1.565,2,3.5c0,1.934-0.896,3.5-2,3.5
- s-2-1.566-2-3.5C86.703,54.571,87.6,53.006,88.703,53.006z M88.703,72.756c-1.381,0-2.5-2.239-2.5-5c0-2.762,1.119-5,2.5-5
- c1.38,0,2.5,2.238,2.5,5C91.203,70.517,90.083,72.756,88.703,72.756z"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/2_qtg_graf_clock_night_sec.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <polygon fill="#29ABE2" points="89.766,97.641 88.766,88.813 87.766,97.641 88.766,162.834 "/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_day_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1.25" y1="88.75" x2="176.25" y2="88.75">
- <stop offset="0" style="stop-color:#424242"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <circle opacity="0.5" fill="url(#SVGID_1_)" cx="88.75" cy="88.75" r="87.5"/>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="88.7505" y1="172.0195" x2="88.7505" y2="-9.1597">
- <stop offset="0" style="stop-color:#424242"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <circle fill="url(#SVGID_2_)" cx="88.75" cy="88.75" r="85"/>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="10.2314" x2="88.7495" y2="167.705">
- <stop offset="0.0549" style="stop-color:#D6D6D6"/>
- <stop offset="0.3132" style="stop-color:#545454"/>
- <stop offset="0.5879" style="stop-color:#CFCFCF"/>
- <stop offset="0.989" style="stop-color:#2E2E2E"/>
- </linearGradient>
- <circle fill="url(#SVGID_3_)" cx="88.75" cy="88.75" r="81"/>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="88.7505" y1="161.5" x2="88.7505" y2="126.4812">
- <stop offset="0" style="stop-color:#E3E3E3"/>
- <stop offset="1" style="stop-color:#1A1A1A"/>
- </linearGradient>
- <circle fill="url(#SVGID_4_)" cx="88.75" cy="88.75" r="72.75"/>
- <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="130.7686" y1="141.0684" x2="45.1015" y2="34.4019">
- <stop offset="0.022" style="stop-color:#C7C7C7"/>
- <stop offset="0.7363" style="stop-color:#6B6B6B"/>
- </linearGradient>
- <circle fill="url(#SVGID_5_)" cx="88.75" cy="88.75" r="68.75"/>
- <circle opacity="0.2" fill="#FFFFFF" cx="88.75" cy="88.75" r="57.5"/>
- </g>
- <g>
- <rect x="86.75" y="26.455" width="4" height="7.5"/>
- <rect x="86.75" y="143.752" width="4" height="7.5"/>
- <rect x="26.159" y="86.75" width="7.5" height="4"/>
- <rect x="143.842" y="86.75" width="7.5" height="4"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_day_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#F15A24" d="M98.75,88.75c0-5.522-4.477-10-10-10s-10,4.478-10,10c0,4.267,2.676,7.898,6.437,9.335v40.69l3.521,2
- l3.479-2V98.132C96.014,96.729,98.75,93.063,98.75,88.75z"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_day_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#F7931E" d="M143.493,88.982l-3-2.233H96.938c-0.988-3.6-4.275-6.249-8.188-6.249c-4.694,0-8.5,3.806-8.5,8.5
- s3.806,8.5,8.5,8.5c3.915,0,7.202-2.649,8.189-6.251h43.554L143.493,88.982z"/>
- <rect y="0.25" fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_day_overlay.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g opacity="0.3">
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.75" y1="76.6992" x2="152.7496" y2="76.6992">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#CFCFCF"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M88.75,24.75c-35.346,0-64,28.654-64,64c0,15.093,5.237,28.955,13.976,39.897l112.788-52.438
- C145.683,46.869,119.803,24.75,88.75,24.75z"/>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_day_sec.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#FCEE21" d="M89.988,84.966V32.098h-2.501v52.876c-1.586,0.53-2.737,2.012-2.737,3.776c0,2.209,1.791,4,4,4s4-1.791,4-4
- C92.75,86.977,91.587,85.489,89.988,84.966z"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_night_bg.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g>
- <g>
- <circle opacity="0.2" fill="#FFFFFF" cx="88.75" cy="88.75" r="87.5"/>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="88.7505" y1="172.0195" x2="88.7505" y2="-9.1597">
- <stop offset="0" style="stop-color:#333333"/>
- <stop offset="1" style="stop-color:#333333"/>
- </linearGradient>
- <circle fill="url(#SVGID_1_)" cx="88.75" cy="88.75" r="85"/>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="10.2314" x2="88.7495" y2="167.705">
- <stop offset="0" style="stop-color:#7D7D7D"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <circle fill="url(#SVGID_2_)" cx="88.75" cy="88.75" r="81"/>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="88.7505" y1="161.5" x2="88.7505" y2="126.4812">
- <stop offset="0" style="stop-color:#636363"/>
- <stop offset="1" style="stop-color:#1F1F1F"/>
- </linearGradient>
- <circle fill="url(#SVGID_3_)" cx="88.75" cy="88.75" r="72.75"/>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="20" x2="88.7495" y2="157.5">
- <stop offset="0" style="stop-color:#7D7D7D"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <circle fill="url(#SVGID_4_)" cx="88.75" cy="88.75" r="68.75"/>
- <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="88.7495" y1="25.499" x2="88.7495" y2="152.3527">
- <stop offset="0" style="stop-color:#333333"/>
- <stop offset="1" style="stop-color:#000000"/>
- </linearGradient>
- <circle fill="url(#SVGID_5_)" cx="88.75" cy="88.75" r="65.25"/>
- <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="31.25" y1="88.75" x2="146.25" y2="88.75">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#CCCCCC"/>
- </linearGradient>
- <circle opacity="0.05" fill="url(#SVGID_6_)" cx="88.75" cy="88.75" r="57.5"/>
- </g>
- <g>
- <rect x="86.75" y="26.455" fill="#FFFFFF" width="4" height="7.5"/>
- <rect x="86.75" y="143.752" fill="#FFFFFF" width="4" height="7.5"/>
- <rect x="26.158" y="86.75" fill="#FFFFFF" width="7.5" height="4"/>
- <rect x="143.842" y="86.75" fill="#FFFFFF" width="7.5" height="4"/>
- </g>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_night_hour.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#2E3192" d="M98.75,88.75c0-5.523-4.477-10-10-10s-10,4.477-10,10c0,4.266,2.676,7.898,6.436,9.334v40.691l3.521,2
- l3.479-2V98.131C96.014,96.729,98.75,93.063,98.75,88.75z"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_night_min.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#00FFFF" d="M143.492,88.982l-3-2.234H96.938c-0.988-3.6-4.275-6.248-8.188-6.248c-4.695,0-8.5,3.806-8.5,8.5
- s3.805,8.5,8.5,8.5c3.914,0,7.201-2.65,8.189-6.251h43.553L143.492,88.982z"/>
- <rect y="0.25" fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_night_overlay.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <g opacity="0.15">
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.75" y1="76.6992" x2="152.7496" y2="76.6992">
- <stop offset="0" style="stop-color:#FFFFFF"/>
- <stop offset="1" style="stop-color:#CFCFCF"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M88.75,24.75c-35.346,0-64,28.654-64,64c0,15.093,5.236,28.955,13.975,39.897l112.789-52.438
- C145.682,46.869,119.803,24.75,88.75,24.75z"/>
- </g>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- a/clock/data/analog/3_qtg_graf_clock_night_sec.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="177.5px" height="177.5px" viewBox="0 0 177.5 177.5" enable-background="new 0 0 177.5 177.5" xml:space="preserve">
-<g>
- <path fill="#0000FF" d="M89.988,84.965V32.098h-2.502v52.875c-1.586,0.531-2.736,2.012-2.736,3.777c0,2.209,1.791,4,4,4
- s4-1.791,4-4C92.75,86.977,91.586,85.489,89.988,84.965z"/>
- <rect fill="none" width="177.5" height="177.5"/>
-</g>
-</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/data/backup_registration.xml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="yes"?>
+<backup_registration version="1.0">
+ <passive_backup>
+ <include_directory name = "\"/>
+ </passive_backup>
+ <proxy_data_manager sid = "0x10202BE9" />
+ <restore requires_reboot = "no"/>
+</backup_registration>
--- a/clock/data/clock.qrc Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/clock">
- <file alias="day.svg">worldclock/qtg_test_day.svg</file>
- <file alias="night.svg">worldclock/qtg_test_night.svg</file>
-
- <file alias="hide_widget.fxml">effects/hide_widget.fxml</file>
- <file alias="show_widget.fxml">effects/show_widget.fxml</file>
-
- <file alias="appear.fxml">effects/appear.fxml</file>
- <file alias="disappear.fxml">effects/disappear.fxml</file>
-
- <file alias="fade_out.fxml">effects/fade_out.fxml</file>
- <file alias="fade_in.fxml">effects/fade_in.fxml</file>
- </qresource>
-</RCC>
\ No newline at end of file
--- a/clock/data/clockwidget.qrc Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/clock">
- <file alias="analog_face_day.svg">analog/0_qtg_graf_clock_day_bg.svg</file>
- <file alias="hour_hand_day.svg">analog/0_qtg_graf_clock_day_hour.svg</file>
- <file alias="minute_hand_day.svg">analog/0_qtg_graf_clock_day_min.svg</file>
-
- <file alias="sep_colon.svg">digital/qsn_cp_clock_digital_new_colon.svg</file>
- <file alias="sep_dot.svg">digital/qsn_cp_clock_digital_new_stop.svg</file>
- <file alias="digit_zero.svg">digital/qsn_cp_clock_digital_new_zero.svg</file>
- <file alias="digit_one.svg">digital/qsn_cp_clock_digital_new_one.svg</file>
- <file alias="digit_two.svg">digital/qsn_cp_clock_digital_new_two.svg</file>
- <file alias="digit_three.svg">digital/qsn_cp_clock_digital_new_three.svg</file>
- <file alias="digit_four.svg">digital/qsn_cp_clock_digital_new_four.svg</file>
- <file alias="digit_five.svg">digital/qsn_cp_clock_digital_new_five.svg</file>
- <file alias="digit_six.svg">digital/qsn_cp_clock_digital_new_six.svg</file>
- <file alias="digit_seven.svg">digital/qsn_cp_clock_digital_new_seven.svg</file>
- <file alias="digit_eight.svg">digital/qsn_cp_clock_digital_new_eight.svg</file>
- <file alias="digit_nine.svg">digital/qsn_cp_clock_digital_new_nine.svg</file>
- </qresource>
-</RCC>
--- a/clock/data/digital/qsn_cp_clock_digital_new_colon.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="12" height="86" viewBox="-0.283 0.065 12 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M3.763,41.12c-1.054,0-2.02,0.391-2.795,1.13c-0.818,0.788-1.25,1.794-1.25,2.911v3.951 c0,1.097,0.421,2.089,1.218,2.87c0.773,0.765,1.751,1.169,2.828,1.169h3.91c1.077,0,2.059-0.408,2.838-1.182 c0.789-0.77,1.206-1.759,1.206-2.857v-3.951c0-1.118-0.429-2.121-1.239-2.9c-0.783-0.746-1.753-1.141-2.805-1.141H3.763z M3.763,63.056c-1.106,0-2.102,0.418-2.879,1.211c-0.764,0.787-1.167,1.766-1.167,2.83v3.949c0,1.098,0.421,2.09,1.218,2.871 c0.765,0.764,1.745,1.17,2.828,1.17h3.91c1.081,0,2.064-0.41,2.844-1.188c0.783-0.771,1.2-1.76,1.2-2.854v-3.949 c0-1.086-0.417-2.074-1.204-2.857c-0.787-0.775-1.769-1.184-2.84-1.184H3.763z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M3.763,41.62c-0.923,0-1.771,0.344-2.452,0.992c-0.717,0.689-1.095,1.57-1.095,2.549v3.951 c0,0.959,0.37,1.828,1.068,2.513c0.68,0.671,1.537,1.026,2.479,1.026h3.91c0.942,0,1.804-0.358,2.487-1.037 c0.691-0.676,1.058-1.541,1.058-2.502v-3.951c0-0.979-0.374-1.857-1.085-2.54c-0.688-0.655-1.539-1.001-2.46-1.001H3.763z M3.763,63.556c-0.97,0-1.843,0.367-2.522,1.061c-0.67,0.691-1.025,1.547-1.025,2.48v3.949c0,0.959,0.37,1.828,1.068,2.514 c0.672,0.672,1.531,1.027,2.479,1.027h3.91c0.946,0,1.808-0.359,2.493-1.041c0.688-0.678,1.052-1.543,1.052-2.5v-3.949 c0-0.951-0.364-1.814-1.056-2.502c-0.691-0.68-1.551-1.039-2.489-1.039H3.763z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M3.763,42.12c-0.792,0-1.521,0.296-2.109,0.855c-0.616,0.592-0.939,1.347-0.939,2.186v3.951 c0,0.821,0.317,1.566,0.917,2.155c0.584,0.578,1.323,0.884,2.131,0.884h3.91c0.809,0,1.547-0.309,2.137-0.893 c0.595-0.581,0.91-1.324,0.91-2.146v-3.951c0-0.839-0.321-1.593-0.932-2.179c-0.592-0.564-1.324-0.862-2.115-0.862H3.763z M3.763,64.056c-0.833,0-1.583,0.314-2.168,0.912c-0.577,0.594-0.88,1.33-0.88,2.129v3.949c0,0.822,0.317,1.568,0.917,2.156 c0.579,0.578,1.317,0.885,2.131,0.885h3.91c0.813,0,1.553-0.311,2.141-0.896c0.593-0.582,0.906-1.324,0.906-2.145v-3.949 c0-0.814-0.313-1.557-0.908-2.146c-0.596-0.586-1.334-0.895-2.139-0.895H3.763z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M3.763,42.62c-0.662,0-1.274,0.248-1.767,0.718c-0.512,0.494-0.783,1.124-0.783,1.823v3.951 c0,0.684,0.265,1.305,0.768,1.797c0.491,0.485,1.106,0.742,1.782,0.742h3.91c0.674,0,1.291-0.259,1.786-0.748 c0.497-0.486,0.762-1.106,0.762-1.791v-3.951c0-0.699-0.269-1.328-0.777-1.818C8.944,42.87,8.335,42.62,7.673,42.62H3.763z M3.763,64.556c-0.695,0-1.322,0.264-1.813,0.762c-0.483,0.498-0.736,1.113-0.736,1.779v3.949c0,0.684,0.265,1.307,0.768,1.799 c0.485,0.484,1.103,0.742,1.782,0.742h3.91c0.678,0,1.295-0.26,1.788-0.75c0.497-0.488,0.76-1.109,0.76-1.791v-3.949 c0-0.678-0.263-1.297-0.76-1.791c-0.499-0.492-1.116-0.75-1.788-0.75H3.763z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M3.763,43.12c-0.532,0-1.024,0.201-1.424,0.58c-0.411,0.396-0.627,0.9-0.627,1.461v3.951 c0,0.546,0.214,1.044,0.618,1.439c0.396,0.393,0.892,0.6,1.434,0.6h3.91c0.541,0,1.036-0.209,1.436-0.604 c0.399-0.392,0.613-0.889,0.613-1.436v-3.951c0-0.561-0.216-1.064-0.623-1.457c-0.403-0.383-0.895-0.584-1.426-0.584H3.763z M3.763,65.056c-0.559,0-1.063,0.213-1.457,0.613c-0.39,0.4-0.594,0.895-0.594,1.428v3.949c0,0.547,0.214,1.045,0.618,1.441 c0.392,0.391,0.888,0.6,1.434,0.6h3.91c0.541,0,1.04-0.209,1.438-0.605c0.399-0.395,0.611-0.891,0.611-1.436v-3.949 c0-0.541-0.212-1.039-0.611-1.438c-0.403-0.395-0.9-0.604-1.438-0.604H3.763z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M3.763,43.62c-0.403,0-0.775,0.153-1.079,0.442c-0.31,0.299-0.473,0.679-0.473,1.099v3.951 c0,0.408,0.162,0.782,0.467,1.082c0.306,0.303,0.672,0.457,1.085,0.457h3.91c0.413,0,0.777-0.154,1.085-0.459 c0.304-0.297,0.466-0.672,0.466-1.08v-3.951c0-0.421-0.164-0.801-0.472-1.097c-0.306-0.291-0.678-0.444-1.079-0.444H3.763z M3.763,65.556c-0.422,0-0.804,0.16-1.101,0.463c-0.296,0.305-0.452,0.678-0.452,1.078v3.949c0,0.408,0.162,0.783,0.467,1.084 c0.304,0.303,0.67,0.457,1.085,0.457h3.91c0.409,0,0.783-0.16,1.087-0.461c0.302-0.299,0.464-0.672,0.464-1.08v-3.949 c0-0.406-0.16-0.779-0.466-1.082c-0.306-0.301-0.68-0.459-1.085-0.459H3.763z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="5.72" y1="4.33" x2="5.72" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M3.763,50.151c-0.278,0-0.524-0.104-0.736-0.314c-0.212-0.209-0.317-0.451-0.317-0.725v-3.951 c0-0.285,0.105-0.531,0.317-0.736c0.212-0.201,0.458-0.305,0.736-0.305h3.91c0.276,0,0.521,0.104,0.734,0.305 c0.212,0.205,0.317,0.451,0.317,0.736v3.951c0,0.273-0.105,0.516-0.317,0.725c-0.213,0.211-0.458,0.314-0.734,0.314H3.763z M3.763,72.087c-0.278,0-0.524-0.104-0.736-0.314c-0.212-0.209-0.317-0.451-0.317-0.727v-3.949c0-0.273,0.104-0.516,0.308-0.727 c0.205-0.209,0.454-0.314,0.746-0.314h3.91c0.276,0,0.521,0.105,0.734,0.314c0.212,0.211,0.317,0.453,0.317,0.727v3.949 c0,0.275-0.105,0.518-0.317,0.727c-0.213,0.211-0.458,0.314-0.734,0.314H3.763z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_colon_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="12" height="86" viewBox="0 0 12 86">
-<rect width="12" height="86"/>
-<path fill="#FFFFFF" d="M4.041,50.086c-0.279,0-0.525-0.104-0.738-0.314c-0.213-0.209-0.318-0.451-0.318-0.725v-3.951 c0-0.285,0.105-0.531,0.318-0.736c0.213-0.201,0.459-0.305,0.738-0.305h3.92c0.277,0,0.523,0.104,0.736,0.305 c0.213,0.205,0.318,0.451,0.318,0.736v3.951c0,0.273-0.105,0.516-0.318,0.725c-0.213,0.211-0.459,0.314-0.736,0.314H4.041z M4.041,72.021c-0.279,0-0.525-0.104-0.738-0.314c-0.213-0.209-0.318-0.451-0.318-0.727v-3.949c0-0.273,0.104-0.516,0.309-0.727 c0.205-0.209,0.455-0.314,0.748-0.314h3.92c0.277,0,0.523,0.105,0.736,0.314c0.213,0.211,0.318,0.453,0.318,0.727v3.949 c0,0.275-0.105,0.518-0.318,0.727c-0.213,0.211-0.459,0.314-0.736,0.314H4.041z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_eight.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.807 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M9.957,5.01c-3.25,0-6.152,1.941-7.395,4.945c-0.002,0.008-0.076,0.219-0.076,0.219 l-0.135,0.443l0,0L2.295,10.84c-0.002,0.004-0.059,0.295-0.105,0.525c-1.264,1.455-1.979,3.232-1.979,5.074v21.929 c0,0.809,0.223,1.673,0.592,2.596c-0.369,0.923-0.592,1.787-0.592,2.596v23.99c0,1.839,0.713,3.614,1.973,5.068 c0.049,0.246,0.109,0.554,0.109,0.554c0.006,0.022,0.186,0.657,0.186,0.657c0.002,0.004,0.08,0.228,0.08,0.228 c1.244,3.01,4.148,4.953,7.398,4.953h12.488c3.246,0,6.146-1.938,7.389-4.938c0.018-0.041,0.035-0.095,0.049-0.139l0.141-0.491 c-0.018,0.059-0.072,0.088-0.098,0.142c0.105-0.234,0.174-0.472,0.207-0.621c0,0,0.033-0.152,0.066-0.302 c1.283-1.467,2.012-3.258,2.012-5.11V43.56c0-0.809-0.223-1.673-0.594-2.596c0.371-0.923,0.594-1.787,0.594-2.596V16.439 c0-1.848-0.725-3.633-2.004-5.097c-0.047-0.228-0.1-0.495-0.1-0.495c-0.002-0.013,0.027,0.247,0.023,0.234l-0.207-0.887 c-0.004-0.014-0.09-0.252-0.09-0.252c-1.236-2.991-4.141-4.934-7.389-4.934H9.957z M29.65,73.981 c-0.035,0.031-0.055,0.073-0.094,0.101C29.592,74.053,29.619,74.015,29.65,73.981z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M11.65,42.895c-0.484,0-0.924,0.329-1.109,0.778c-0.186,0.447-0.086,1.002,0.258,1.344 c0.148,0.148,0.236,0.359,0.236,0.566v19.943c0,0.217-0.082,0.412-0.234,0.565l-0.139,0.138c-0.383,0.383-0.398,0.957-0.131,1.427 s0.881,0.686,1.404,0.551l0.1-0.025l8.387,0.004c0.523,0.134,1.168-0.07,1.438-0.539c0.268-0.47,0.285-1.031-0.098-1.413 l-0.141-0.142c-0.154-0.153-0.234-0.349-0.234-0.565V45.583c0-0.207,0.088-0.418,0.234-0.566l0.092-0.092 c0.352-0.35,0.355-0.871,0.154-1.324s-0.754-0.727-1.248-0.703l0.064-0.003H11.65z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M20.602,15.775l-0.148,0.037c0.029-0.002-0.059,0.02-0.031,0.02H11.98 c-0.004-0.014-0.17-0.057-0.17-0.057c-0.523-0.132-1.055,0.105-1.322,0.574c-0.266,0.469-0.172,1.063,0.209,1.445l0.1,0.101 c0.15,0.149,0.238,0.361,0.238,0.568v17.881c0,0.207-0.088,0.418-0.236,0.566l-0.346,0.346c-0.361,0.361-0.418,0.906-0.195,1.365 c0.221,0.459,0.744,0.723,1.252,0.666l0.141-0.017h9.033l0.186,0.026c0.51,0.074,1.063-0.178,1.295-0.64s0.193-1.011-0.172-1.376 l-0.371-0.371c-0.146-0.148-0.234-0.359-0.234-0.566V18.464c0-0.207,0.088-0.419,0.234-0.565l0.107-0.107 c0.383-0.383,0.473-0.978,0.205-1.447C21.664,15.873,21.125,15.639,20.602,15.775z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M9.957,6.21c-2.762,0-5.229,1.65-6.285,4.204c-0.014,0.035-0.031,0.089-0.043,0.125 L3.5,10.965c-0.012,0.038-0.021,0.078-0.029,0.116c0,0-0.096,0.476-0.16,0.794c-1.211,1.268-1.9,2.861-1.9,4.564v21.929 c0,0.85,0.254,1.709,0.664,2.596C1.664,41.851,1.41,42.71,1.41,43.56v23.99c0,1.701,0.688,3.293,1.896,4.56 c0.063,0.324,0.164,0.827,0.164,0.827c0.012,0.058,0.158,0.552,0.158,0.552c0.012,0.039,0.025,0.075,0.041,0.113 c1.057,2.557,3.523,4.208,6.287,4.208h12.488c2.76,0,5.225-1.647,6.281-4.197c-0.002,0.002,0.145-0.503,0.145-0.503 c-0.002,0.007,0.131-0.595,0.213-0.971c1.229-1.276,1.926-2.88,1.926-4.589V43.56c0-0.85-0.254-1.709-0.662-2.596 c0.408-0.887,0.662-1.746,0.662-2.596V16.439c0-1.709-0.697-3.311-1.926-4.586c-0.063-0.314-0.152-0.771-0.152-0.771 c0-0.003-0.16-0.553-0.16-0.553c-0.012-0.043-0.023-0.072-0.041-0.113c-1.057-2.555-3.523-4.206-6.285-4.206H9.957z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M9.957,7.41c-2.275,0-4.307,1.359-5.176,3.462c0.002-0.004-0.135,0.444-0.135,0.444 s-0.18,0.9-0.221,1.103c-1.141,1.054-1.814,2.477-1.814,4.021v21.929c0,0.909,0.305,1.778,0.758,2.596 c-0.453,0.817-0.758,1.687-0.758,2.596v23.99c0,1.543,0.672,2.964,1.811,4.018c0.023,0.114,0.225,1.136,0.225,1.136 c0.002,0.004,0.133,0.44,0.133,0.44c0.871,2.108,2.902,3.466,5.178,3.466h12.488c2.271,0,4.303-1.356,5.172-3.456 c0.027-0.065,0.064-0.223,0.08-0.292c0,0,0.25-1.138,0.279-1.276c1.152-1.062,1.834-2.49,1.834-4.035V43.56 c0-0.909-0.305-1.778-0.76-2.596c0.455-0.817,0.76-1.687,0.76-2.596V16.439c0-1.546-0.684-2.978-1.842-4.041 c-0.037-0.185-0.215-1.084-0.215-1.084c0-0.005-0.131-0.439-0.131-0.439C26.75,8.768,24.719,7.41,22.445,7.41H9.957z M16.586,20.633c0,1.895,0,11.944,0,13.838c-0.354,0-0.396,0-0.75,0c0-1.894,0-11.943,0-13.838 C16.189,20.633,16.232,20.633,16.586,20.633z M16.586,47.695c0,1.943,0,13.746,0,15.689c-0.354,0-0.396,0-0.75,0 c0-1.943,0-13.746,0-15.689C16.189,47.695,16.232,47.695,16.586,47.695z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M9.957,8.61c-1.787,0-3.383,1.067-4.066,2.72c-0.029,0.072-0.053,0.146-0.068,0.225 l-0.244,1.225c-0.018,0.094-0.033,0.104-0.033,0.145c0,0.016,0.004,0.041,0.008,0.068c-1.078,0.82-1.742,2.059-1.742,3.447v21.929 c0,0.947,0.34,1.847,0.906,2.596c-0.566,0.749-0.906,1.648-0.906,2.596v23.99c0,1.392,0.664,2.631,1.746,3.451l-0.002,0.005 c-0.006,0.044-0.01,0.069-0.01,0.089c0,0.041,0.016,0.051,0.033,0.146l0.246,1.229c0.016,0.077,0.037,0.151,0.066,0.224 c0.682,1.65,2.277,2.717,4.066,2.717h12.488c1.787,0,3.383-1.066,4.066-2.718c-0.002,0.004-0.002,0.004-0.002,0.004 c0-0.07,0.314-1.454,0.314-1.454c0.021-0.097,0.035-0.104,0.035-0.138c0-0.017-0.004-0.045-0.012-0.091 c1.08-0.82,1.762-2.083,1.762-3.463V43.56c0-0.947-0.34-1.847-0.904-2.596c0.564-0.749,0.904-1.648,0.904-2.596V16.439 c0-1.377-0.682-2.639-1.76-3.459c0.002-0.021,0.006-0.045,0.006-0.057c0-0.041-0.014-0.051-0.033-0.146l-0.244-1.229 c-0.016-0.076-0.039-0.15-0.068-0.223c-0.682-1.65-2.277-2.716-4.064-2.716H9.957z M17.785,19.433c0,1.663,0,15.061,0,16.238 c-1.104,0-2.045,0-3.15,0c0-1.178,0-14.575,0-16.238C15.719,19.433,16.701,19.433,17.785,19.433z M17.785,46.495 c0,1.578,0,16.463,0,18.09c-1.086,0-2.064,0-3.15,0c0-1.627,0-16.512,0-18.09C15.723,46.495,16.697,46.495,17.785,46.495z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M9.957,9.811c-1.299,0-2.461,0.776-2.957,1.979l-0.244,1.225 c0,0.189,0.076,0.36,0.107,0.543c-1.123,0.527-1.852,1.635-1.852,2.883v21.929c0,1.059,0.533,2.006,1.375,2.596 c-0.842,0.59-1.375,1.537-1.375,2.596v23.99c0,1.252,0.73,2.36,1.857,2.886c-0.035,0.191-0.113,0.371-0.113,0.57L7,72.234 c0.496,1.199,1.656,1.975,2.957,1.975h12.488c1.301,0,2.461-0.776,2.957-1.977c0.002-0.002,0.244-1.226,0.244-1.226 c0-0.195-0.076-0.372-0.111-0.561c1.137-0.521,1.875-1.637,1.875-2.896V43.56c0-1.059-0.533-2.006-1.375-2.596 c0.842-0.591,1.375-1.537,1.375-2.596V16.439c0-1.256-0.736-2.371-1.871-2.893c0.031-0.18,0.107-0.348,0.107-0.534L25.4,11.784 c-0.494-1.198-1.656-1.974-2.955-1.974H9.957z M19.033,18.232c-0.006,0.079-0.047,0.152-0.047,0.231v17.881 c0,0.182,0.074,0.35,0.105,0.526c-1.674,0-4.02,0-5.762,0c0.029-0.177,0.105-0.345,0.105-0.526V18.464 c0-0.079-0.041-0.152-0.047-0.231C14.957,18.232,17.48,18.232,19.033,18.232z M19.043,45.295c-0.008,0.099-0.057,0.188-0.057,0.288 v19.943c0,0.09,0.043,0.17,0.051,0.259c-1.551,0-4.086,0-5.654,0c0.008-0.089,0.053-0.169,0.053-0.259V45.583 c0-0.1-0.049-0.189-0.059-0.288C15.129,45.295,17.359,45.295,19.043,45.295z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M24.975,40.216c0.75-0.311,1.234-1.036,1.234-1.848V16.439c0-0.811-0.484-1.537-1.234-1.848 c-0.398-0.165-0.818-0.158-1.219-0.064c0.01-0.01,0.104-0.102,0.104-0.102c0.383-0.384,0.586-0.894,0.586-1.413 c0-0.259-0.049-0.519-0.152-0.769c-0.311-0.748-1.035-1.233-1.848-1.233H9.957c-0.813,0-1.537,0.485-1.848,1.236 c-0.104,0.248-0.154,0.509-0.154,0.767c0,0.519,0.205,1.027,0.588,1.412c0,0,0.09,0.088,0.098,0.098 c-0.393-0.088-0.803-0.094-1.195,0.068c-0.75,0.311-1.234,1.037-1.234,1.848v21.929c0,0.812,0.484,1.537,1.234,1.848 c0.451,0.188,0.936,0.18,1.379,0.035c-0.117,0.258-0.186,0.538-0.186,0.83c0,0.193,0.037,0.381,0.09,0.562 c-0.418-0.112-0.865-0.104-1.283,0.069c-0.75,0.311-1.234,1.037-1.234,1.848v23.99c0,0.813,0.486,1.538,1.236,1.849 c0.402,0.166,0.826,0.159,1.23,0.061c-0.018,0.018-0.135,0.136-0.135,0.136c-0.385,0.382-0.588,0.892-0.588,1.411 c0,0.259,0.051,0.52,0.154,0.77c0.309,0.749,1.035,1.233,1.848,1.233h12.488c0.814,0,1.539-0.485,1.85-1.235 c0.102-0.249,0.152-0.509,0.152-0.767c0-0.519-0.203-1.028-0.588-1.412c0,0-0.121-0.122-0.139-0.141 c0.41,0.105,0.844,0.113,1.256-0.057c0.748-0.31,1.232-1.035,1.232-1.848V43.56c0-0.811-0.484-1.537-1.234-1.848 c-0.451-0.188-0.936-0.18-1.379-0.035c0.061-0.191,0.1-0.391,0.1-0.596c0-0.307-0.076-0.6-0.205-0.868 C23.961,40.397,24.486,40.418,24.975,40.216z M11.98,17.032h8.441c0.16,0,0.307-0.054,0.459-0.091 c-0.012,0.012-0.107,0.107-0.107,0.107c-0.373,0.373-0.588,0.889-0.588,1.415v17.881c0,0.526,0.215,1.041,0.588,1.414l0.369,0.371 c-0.148-0.035-0.301-0.059-0.459-0.059H11.65c-0.117,0-0.234,0.014-0.348,0.034l0.346-0.347c0.373-0.373,0.586-0.889,0.586-1.414 V18.464c0-0.526-0.213-1.042-0.586-1.415c0,0-0.094-0.093-0.104-0.103C11.689,16.979,11.828,17.032,11.98,17.032z M20.422,66.985 H11.98c-0.164,0-0.314,0.055-0.469,0.093c0.018-0.018,0.137-0.138,0.137-0.138c0.379-0.378,0.586-0.88,0.586-1.414V45.583 c0-0.525-0.213-1.041-0.586-1.414l-0.082-0.083c0.027,0.001,0.057,0.009,0.084,0.009h9.033c0.061,0,0.121-0.013,0.182-0.018 c-0.059,0.057-0.092,0.092-0.092,0.092c-0.373,0.373-0.588,0.889-0.588,1.414v19.943c0,0.534,0.209,1.036,0.586,1.414 c0,0,0.123,0.123,0.143,0.142C20.752,67.041,20.594,66.985,20.422,66.985z"/>
-<linearGradient id="_3" gradientUnits="userSpaceOnUse" x1="16.21" y1="4.33" x2="16.21" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_3)" d="M11.234,36.759l-4.023,4.023V14.024l4.023,4.025V36.759z M11.234,65.94l-4.023,4.023V41.146 l4.023,4.023V65.94z M11.566,16.032l-4.025-4.021h17.318l-4.023,4.021H11.566z M20.836,67.985l4.023,4.023H7.541l4.025-4.023 H20.836z M21.186,18.05l4.023-4.025v26.758l-4.023-4.023V18.05z M21.186,45.169l4.023-4.023v28.818l-4.023-4.023V45.169z"/>
-<polygon fill="url(#_3)" points="21.098,43.095 23.109,41.081 21.098,39.071 11.236,39.071 9.225,41.081 11.236,43.095 "/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_eight_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.043,43.029l-2.012-2.014l2.012-2.01h9.861l2.012,2.01l-2.012,2.014H12.043z"/>
-<path fill="#FFFFFF" d="M12.041,36.694l-4.023,4.022V13.96l4.023,4.025V36.694z M12.041,65.875l-4.023,4.023V41.08l4.023,4.023 V65.875z M12.373,15.968l-4.025-4.021h17.318l-4.023,4.021H12.373z M21.643,67.92l4.023,4.023H8.348l4.025-4.023H21.643z M21.992,17.985l4.023-4.025v26.757l-4.023-4.022V17.985z M21.992,45.104l4.023-4.023v28.818l-4.023-4.023V45.104z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_five.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.015 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.782,4.872c-3.328,0-6.303,1.988-7.577,5.064l-0.083,0.236L2.989,10.61l-0.055,0.219 c-0.001,0.004-0.053,0.264-0.096,0.479c-1.305,1.496-2.043,3.318-2.043,5.197v21.846c0,2.682,1.383,5.127,3.669,6.666 c0.377,0.752,0.778,1.367,1.231,1.822l1.014,1.014c1.552,1.549,3.611,2.402,5.799,2.402c0,0,1.252,0,2.283,0 c0,1.774,0,8.787,0,10.563c-0.933,0-1.985-0.001-1.985-0.001c-2.19,0-4.249,0.854-5.799,2.403l-2.024,2.021 c-2.354,2.354-3.051,5.861-1.779,8.938c1.274,3.076,4.248,5.064,7.577,5.064h12.489c3.328,0,6.302-1.988,7.575-5.063 c-0.001,0.002,0.08-0.227,0.08-0.227l0.132-0.434c0.001-0.002,0.06-0.232,0.06-0.232s0.067-0.34,0.118-0.594 c1.266-1.486,1.982-3.285,1.982-5.129V43.611c0-2.702-1.396-5.157-3.705-6.693c-0.367-0.694-0.748-1.265-1.17-1.685l-1.005-1.004 c-1.546-1.547-3.604-2.4-5.796-2.4c0,0-1.277,0-2.32,0c0-1.668,0-6.865,0-8.533c0.946,0,2.025,0,2.025,0 c2.188,0,4.248-0.854,5.797-2.402l2.021-2.021c1.552-1.551,2.406-3.609,2.406-5.795c0-1.08-0.211-2.137-0.625-3.139 c-1.274-3.078-4.248-5.066-7.577-5.066H10.782z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.782,6.072c-2.842,0-5.381,1.697-6.469,4.323c-0.015,0.037-0.029,0.079-0.041,0.117 l-0.135,0.445c-0.011,0.037-0.02,0.074-0.027,0.112c0,0-0.088,0.438-0.149,0.748c-1.253,1.309-1.965,2.946-1.965,4.687v21.846 c0,2.426,1.315,4.619,3.409,5.891c0.332,0.715,0.701,1.31,1.141,1.749l1.014,1.014c1.323,1.322,3.081,2.051,4.949,2.051 c0,0,2.156,0,3.483,0c0,1.866,0,11.096,0,12.963c-1.267-0.001-3.187-0.001-3.187-0.001c-1.869,0-3.627,0.729-4.949,2.051 l-2.023,2.023c-2.01,2.008-2.605,5.004-1.52,7.629c1.088,2.625,3.626,4.322,6.468,4.322h12.489c2.842,0,5.379-1.695,6.467-4.32 c0.014-0.035,0.031-0.086,0.043-0.123l0.131-0.428c0.012-0.039,0.021-0.078,0.029-0.117c0,0,0.106-0.533,0.172-0.863 c1.215-1.303,1.905-2.92,1.905-4.625V43.611c0-2.44-1.325-4.642-3.437-5.91c-0.326-0.661-0.678-1.212-1.086-1.617l-1.006-1.005 c-1.319-1.321-3.076-2.05-4.947-2.05c0,0-2.186,0-3.521,0c0-1.79,0-9.144,0-10.934c1.274,0,3.226,0,3.226,0 c1.869,0,3.626-0.729,4.949-2.051l2.021-2.021c1.324-1.324,2.054-3.082,2.054-4.947c0-0.922-0.18-1.824-0.534-2.681 c-1.088-2.627-3.626-4.324-6.468-4.324H10.782z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.782,7.272c-2.354,0-4.458,1.406-5.359,3.582l-0.137,0.451c0,0-0.126,0.633-0.21,1.056 c-1.183,1.097-1.88,2.567-1.88,4.144v21.846c0,2.182,1.239,4.104,3.146,5.098c0.283,0.679,0.617,1.26,1.052,1.693l1.013,1.014 c1.098,1.096,2.554,1.699,4.102,1.699c0,0,3.163,0,4.684,0c0,1.936,0,13.428,0,15.363c-1.479,0-4.387,0-4.387,0 c-1.549,0-3.006,0.604-4.102,1.699l-2.023,2.021c-1.664,1.666-2.158,4.146-1.258,6.322s3.004,3.582,5.358,3.582h12.489 c2.354,0,4.457-1.406,5.357-3.58l0.136-0.445c0,0,0.187-0.934,0.232-1.162c1.146-1.094,1.821-2.545,1.821-4.09V43.611 c0-2.188-1.246-4.118-3.166-5.108c-0.279-0.629-0.601-1.168-1.003-1.568l-1.007-1.006c-1.094-1.096-2.55-1.699-4.1-1.699 c0,0-3.195,0-4.721,0c0-1.879,0-11.455,0-13.334c1.485,0,4.426,0,4.426,0c1.549,0,3.004-0.604,4.101-1.699l2.022-2.021 c1.097-1.097,1.701-2.553,1.701-4.098c0-0.765-0.149-1.512-0.443-2.223c-0.9-2.176-3.004-3.582-5.358-3.582H10.782z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.782,8.473c-1.867,0-3.535,1.115-4.25,2.841c-0.03,0.072-0.053,0.148-0.068,0.225 c0,0-0.277,1.384-0.281,1.41c-1.104,0.863-1.786,2.145-1.786,3.557v21.846c0,1.867,1.114,3.535,2.839,4.249 c0,0,0.037,0.009,0.042,0.011c0.22,0.645,0.515,1.23,0.966,1.684l1.014,1.013c0.869,0.869,2.024,1.348,3.252,1.348 c0,0,4.198,0,5.884,0c0,1.726,0,15.871,0,17.765c-1.638,0-5.587-0.002-5.587-0.002c-1.229,0-2.383,0.479-3.252,1.348l-2.024,2.023 c-1.32,1.32-1.712,3.287-0.998,5.014c0.714,1.725,2.382,2.84,4.25,2.84h12.489c1.867,0,3.535-1.115,4.249-2.84 c0.03-0.072,0.053-0.146,0.068-0.223l0.261-1.305c0.018-0.092,0.031-0.105,0.031-0.15c0-0.01-0.002-0.025-0.004-0.037 c1.076-0.863,1.741-2.133,1.741-3.521V43.611c0-1.866-1.114-3.534-2.839-4.249c0,0-0.041-0.01-0.048-0.012 c-0.224-0.602-0.509-1.148-0.929-1.566l-1.008-1.008c-0.867-0.867-2.022-1.347-3.252-1.347c0,0-4.209,0-5.921,0 c0-1.507,0-13.808,0-15.734c1.636,0,5.626,0,5.626,0c1.229,0,2.383-0.479,3.252-1.348l2.022-2.021c0.87-0.871,1.35-2.025,1.35-3.25 c0-0.606-0.118-1.199-0.352-1.764c-0.714-1.726-2.382-2.841-4.25-2.841H10.782z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.782,9.673c-1.38,0-2.613,0.824-3.142,2.1l-0.26,1.303c0,0.146,0.052,0.289,0.073,0.435 c-1.127,0.581-1.857,1.714-1.857,2.995v21.846c0,1.379,0.824,2.612,2.099,3.141c0.158,0.066,0.341,0.061,0.51,0.099 c0.115,0.693,0.381,1.349,0.888,1.856l1.012,1.012c0.643,0.643,1.496,0.996,2.404,0.996c0,0,4.906,0,7.117,0 c-0.004,0.062-0.033,0.119-0.033,0.181v19.907c0,0.025,0.013,0.051,0.014,0.076c-2.133,0-6.801,0-6.801,0 c-0.908,0-1.762,0.354-2.404,0.996l-2.023,2.021c-0.977,0.977-1.266,2.432-0.738,3.707c0.528,1.275,1.762,2.1,3.142,2.1h12.489 c1.379,0,2.612-0.824,3.141-2.1l0.261-1.305c0-0.164-0.058-0.328-0.085-0.492c1.109-0.586,1.83-1.709,1.83-2.98V43.611 c0-1.38-0.824-2.612-2.099-3.141c-0.155-0.064-0.333-0.06-0.497-0.097c-0.131-0.648-0.387-1.262-0.867-1.74l-1.009-1.008 c-0.642-0.643-1.495-0.996-2.403-0.996c0,0-4.917,0-7.18,0c0.01-0.104,0.059-0.198,0.059-0.303V18.529 c0-0.012-0.006-0.022-0.006-0.034c2.108,0,6.832,0,6.832,0c0.908,0,1.762-0.354,2.404-0.996l2.021-2.021 c0.652-0.652,0.998-1.518,0.998-2.4c0-0.439-0.086-0.882-0.26-1.305c-0.528-1.275-1.762-2.1-3.142-2.1H10.782z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.782,10.873c-0.893,0-1.691,0.534-2.033,1.358c-0.113,0.273-0.168,0.561-0.168,0.844 c0,0.443,0.173,0.861,0.432,1.232c-0.289-0.002-0.58,0.051-0.857,0.165v0.001c-0.825,0.342-1.358,1.139-1.358,2.031v21.846 c0,0.893,0.533,1.69,1.358,2.032c0.41,0.17,0.84,0.169,1.254,0.088c-0.051,0.187-0.112,0.372-0.112,0.571 c0,0.587,0.229,1.14,0.645,1.555l1.013,1.013c0.415,0.415,0.968,0.645,1.555,0.645c0,0,8.392,0,8.813,0 c-0.324,0.393-0.528,0.865-0.528,1.381v19.907c0,0.473,0.183,0.902,0.458,1.277c-0.002,0-8.445-0.002-8.445-0.002 c-0.588,0-1.141,0.229-1.556,0.645l-2.024,2.023c-0.631,0.631-0.818,1.572-0.477,2.398c0.342,0.824,1.139,1.357,2.032,1.357h12.489 c0.893,0,1.69-0.533,2.032-1.357c0.114-0.275,0.169-0.561,0.169-0.846c0-0.459-0.182-0.893-0.458-1.271 c0.284,0,0.57-0.055,0.845-0.168c0.825-0.342,1.358-1.141,1.358-2.033V43.611c0-0.894-0.533-1.69-1.358-2.032 c-0.389-0.161-0.795-0.165-1.191-0.1c0.03-0.146,0.087-0.285,0.087-0.438c0-0.59-0.229-1.143-0.646-1.558l-1.011-1.01 c-0.414-0.415-0.967-0.645-1.555-0.645c0,0-8.73,0-8.931,0c0.387-0.409,0.609-0.937,0.609-1.503V18.529 c0-0.456-0.175-0.872-0.432-1.237c0.006,0,0.011,0.003,0.017,0.003h8.441c0.588,0,1.141-0.229,1.556-0.645l2.022-2.021 c0.631-0.633,0.818-1.573,0.477-2.398c-0.342-0.824-1.139-1.358-2.032-1.358H10.782z M23.46,42.056L23.46,42.056L23.46,42.056z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="17.01" y1="4.33" x2="17.01" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M12.021,36.741l-4.023,4.023V14.091l4.023,4.024V36.741z M12.392,16.095l-4.025-4.021h17.318 l-4.023,4.021H12.392z M21.661,68.019l4.023,4.023H8.366l4.025-4.023H21.661z M12.095,43.054l-2.012-2.013l2.012-2.011h9.861 l2.012,2.011l-2.012,2.013H12.095z M21.993,45.221l4.023-4.023v28.782l-4.023-4.023V45.221z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_five_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.035,36.677l-4.023,4.022V14.026l4.023,4.024V36.677z M12.406,16.03l-4.025-4.021h17.318l-4.023,4.021 H12.406z M21.676,67.953l4.023,4.023H8.381l4.025-4.023H21.676z M12.109,42.988l-2.012-2.012l2.012-2.012h9.861l2.012,2.012 l-2.012,2.012H12.109z M22.008,45.156l4.023-4.023v28.781l-4.023-4.023V45.156z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_four.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.224 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M5.647,7.433L5.647,7.433c-3.078,1.275-5.066,4.25-5.066,7.578v23.345 c0,2.446,1.168,4.701,3.17,6.276c0.404,0.914,0.861,1.659,1.412,2.211l1.014,1.015c1.553,1.55,3.611,2.402,5.799,2.402 c0,0,1.479,0,2.602,0c0,2.065,0,15.368,0,15.368c0,2.189,0.854,4.25,2.402,5.799l2.023,2.023c2.354,2.352,5.859,3.051,8.934,1.779 c3.078-1.275,5.066-4.25,5.066-7.578V43.736c0-0.842-0.229-1.737-0.607-2.69c0.379-0.953,0.607-1.849,0.607-2.69V15.011 c0-3.328-1.986-6.303-5.063-7.576c-3.07-1.271-6.576-0.576-8.93,1.771l-0.094,0.109l-1.896,1.881 c-0.082,0.082-0.145,0.205-0.223,0.292c-0.068-0.073-0.123-0.183-0.193-0.253l-2.023-2.023C12.228,6.86,8.72,6.161,5.647,7.433z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M6.106,8.542L6.106,8.542c-2.627,1.089-4.324,3.628-4.324,6.469v23.345 c0,2.198,1.111,4.227,2.943,5.55c0.35,0.857,0.762,1.564,1.287,2.09l1.014,1.014c1.324,1.322,3.082,2.051,4.949,2.051 c0,0,2.416,0,3.803,0c0,2.086,0,16.568,0,16.568c0,1.869,0.729,3.627,2.051,4.949l2.021,2.023c2.01,2.01,5.004,2.605,7.627,1.52 c2.629-1.09,4.326-3.629,4.326-6.469V43.736c0-0.886-0.26-1.776-0.678-2.69c0.418-0.914,0.678-1.805,0.678-2.69V15.011 c0-2.842-1.697-5.38-4.322-6.467c-2.621-1.085-5.613-0.492-7.623,1.512c-0.031,0.092-2.002,2.002-2.002,2.002 c-0.424,0.424-0.764,0.899-1.061,1.396c-0.295-0.488-0.627-0.956-1.039-1.368l-2.023-2.024C11.724,8.053,8.729,7.456,6.106,8.542z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M6.565,9.651H6.563c-2.176,0.902-3.582,3.006-3.582,5.359v23.345 c0,1.968,1.049,3.745,2.719,4.81c0.287,0.799,0.654,1.475,1.162,1.982l1.012,1.013c1.098,1.096,2.555,1.699,4.102,1.699 c0,0,3.441,0,5.002,0c0,2.106,0,17.769,0,17.769c0,1.549,0.604,3.006,1.699,4.102l2.023,2.023c1.664,1.664,4.145,2.158,6.318,1.258 c2.178-0.902,3.584-3.006,3.584-5.359V43.736c0-0.949-0.309-1.85-0.77-2.69c0.461-0.842,0.77-1.741,0.77-2.69V15.011 c0-2.354-1.404-4.457-3.58-5.357c-2.172-0.9-4.652-0.408-6.316,1.252c-0.029,0.027-0.02,0.072-0.043,0.104 c-0.379,0.367-1.973,1.91-1.973,1.91c-1.109,1.11-1.713,2.566-1.713,4.115c0,0,0,15.104,0,17.2c-0.182,0-0.189,0-0.371,0 c0-2.097,0-17.2,0-17.2c0-1.549-0.604-3.006-1.699-4.102l-2.023-2.023C11.22,9.245,8.739,8.751,6.565,9.651z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M7.024,10.76c-0.002,0-0.002,0.001-0.002,0.001c-1.725,0.715-2.84,2.383-2.84,4.25v23.345 c0,1.729,0.982,3.255,2.494,4.043c0.213,0.733,0.527,1.394,1.035,1.901l1.012,1.012c0.869,0.869,2.025,1.348,3.252,1.348 c0,0,4.463,0,6.203,0c0,1.639,0,18.969,0,18.969c0,1.229,0.479,2.383,1.348,3.252l2.021,2.025c1.32,1.318,3.289,1.711,5.014,0.996 c1.727-0.715,2.842-2.383,2.842-4.25V43.736c0-0.989-0.334-1.915-0.908-2.69c0.574-0.775,0.908-1.702,0.908-2.69V15.011 c0-1.867-1.115-3.535-2.84-4.25c-1.723-0.713-3.689-0.323-5.012,0.994c0.004-0.004,0.18-0.111,0.184-0.115l-2.209,2.142 c-0.869,0.87-1.348,2.024-1.348,3.253c0,0,0,16.77,0,18.4c-1.006,0-1.768,0-2.771,0c0-1.631,0-18.4,0-18.4 c0-1.229-0.479-2.383-1.348-3.252l-2.023-2.025C10.716,10.438,8.749,10.046,7.024,10.76z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M7.481,11.868L7.481,11.868c-1.275,0.529-2.1,1.763-2.1,3.143v23.345 c0,1.38,0.824,2.612,2.1,3.141c0,0,0.086,0.015,0.178,0.03c0.104,0.721,0.377,1.4,0.9,1.924l1.012,1.013 c0.643,0.642,1.496,0.996,2.404,0.996c0,0,5.318,0,7.463,0c-0.01,0.103-0.061,0.196-0.061,0.301v19.868 c0,0.908,0.354,1.762,0.996,2.404l2.023,2.023c0.975,0.975,2.43,1.266,3.705,0.738c1.275-0.529,2.1-1.764,2.1-3.143V43.736 c0-1.081-0.516-2.058-1.348-2.69c0.832-0.633,1.348-1.61,1.348-2.69V15.011c0-1.38-0.824-2.613-2.098-3.141 c-1.275-0.527-2.729-0.239-3.705,0.734c0.027-0.027,0.074-0.018,0.104-0.043c-0.361,0.301-0.953,0.893-2.129,2.068 c-0.643,0.643-0.996,1.496-0.996,2.404v19.298c0,0.105,0.051,0.199,0.061,0.303c-1.578,0-3.578,0-5.291,0 c0.01-0.103,0.059-0.198,0.059-0.303V17.034c0-0.908-0.354-1.762-0.996-2.404l-2.023-2.023 C10.212,11.631,8.757,11.341,7.481,11.868z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M7.94,12.978L7.94,12.978c-0.824,0.342-1.357,1.14-1.357,2.033v23.345 c0,0.894,0.533,1.69,1.357,2.032c0.301,0.125,0.613,0.164,0.924,0.153c-0.041,0.167-0.1,0.329-0.1,0.505 c0,0.588,0.229,1.141,0.645,1.557l1.012,1.012c0.416,0.416,0.969,0.645,1.555,0.645h9.033c0.072,0,0.135-0.034,0.205-0.041 c-0.408,0.414-0.635,0.96-0.635,1.542v19.868c0,0.588,0.229,1.141,0.645,1.557l2.021,2.023c0.633,0.631,1.574,0.818,2.398,0.477 c0.826-0.342,1.359-1.141,1.359-2.033V43.736c0-0.894-0.533-1.69-1.359-2.032c-0.506-0.21-1.051-0.199-1.547-0.029 c0.061-0.205,0.125-0.41,0.125-0.629s-0.064-0.424-0.125-0.629c0.496,0.17,1.041,0.181,1.547-0.029 c0.826-0.342,1.359-1.139,1.359-2.032V15.011c0-0.894-0.533-1.691-1.359-2.033c-0.824-0.341-1.764-0.154-2.396,0.477l-2.023,2.024 c-0.416,0.415-0.645,0.968-0.645,1.556v19.298c0,0.583,0.227,1.13,0.637,1.544c-0.072-0.007-0.135-0.041-0.207-0.041 c0,0-7.848,0-8.611,0c0.387-0.41,0.609-0.938,0.609-1.503V17.034c0-0.588-0.23-1.141-0.645-1.556l-2.023-2.024 C9.706,12.823,8.767,12.636,7.94,12.978z M23.245,42.181L23.245,42.181L23.245,42.181z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.79" y1="4.33" x2="16.79" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.806,36.746L7.782,40.77V12.596l4.023,4.024V36.746z M11.562,43.059L9.55,41.046l2.012-2.011 h9.861l2.012,2.011l-2.012,2.013H11.562z M21.778,16.62l4.023-4.024V40.77l-4.023-4.023V16.62z M21.778,45.346l4.023-4.023v28.743 l-4.023-4.023V45.346z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_four_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.029,36.682l-4.023,4.023V12.531l4.023,4.024V36.682z M11.785,42.994L9.773,40.98l2.012-2.01h9.861 l2.012,2.01l-2.012,2.014H11.785z M22.002,16.556l4.023-4.024v28.174l-4.023-4.023V16.556z M22.002,45.281l4.023-4.023V70 l-4.023-4.023V45.281z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_nine.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.433 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.294,4.854c-3.33,0-6.307,1.99-7.58,5.068c-0.01,0.028-0.217,0.69-0.217,0.69 C2.46,10.735,2.44,10.859,2.44,10.981c0,0.018,0.012,0.03,0.014,0.047c-0.025,0.086-0.031,0.108-0.053,0.178 c-1.338,1.508-2.094,3.354-2.094,5.258v21.891c0,2.682,1.383,5.127,3.67,6.668c0.377,0.749,0.777,1.363,1.232,1.818l1.012,1.013 c1.549,1.551,3.609,2.405,5.799,2.405c0,0,1.277,0,2.32,0c0,1.773,0,8.777,0,10.552c-0.945,0-2.023,0-2.023,0 c-2.189,0-4.25,0.854-5.797,2.403l-2.023,2.021c-1.551,1.555-2.404,3.613-2.404,5.797l0.012,0.236l0.047,0.479 c0.002,0.004,0.037,0.236,0.037,0.236l0.258,1.291c-0.004-0.014,0.059,0.234,0.059,0.234l0.127,0.424 c0,0.004,0.084,0.236,0.084,0.236c1.271,3.076,4.246,5.068,7.578,5.068h12.488c3.33,0,6.303-1.988,7.576-5.066l0.076-0.213 l0.139-0.447c0.004-0.012,0.043-0.201,0.082-0.383c1.35-1.506,2.113-3.354,2.113-5.27V43.655c0-0.812-0.242-1.695-0.643-2.65 c0.4-0.954,0.643-1.838,0.643-2.65V16.464c0-1.884-0.74-3.708-2.049-5.205c-0.041-0.209-0.088-0.441-0.088-0.441 c0.002,0.012-0.195-0.678-0.195-0.678c0.002,0.002-0.076-0.217-0.076-0.217c-1.277-3.082-4.25-5.068-7.578-5.068H10.294z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.294,6.055c-2.844,0-5.383,1.698-6.471,4.327c-0.004,0.013-0.178,0.582-0.178,0.582 c0.02-0.067,0.084-0.102,0.115-0.163c-0.113,0.266-0.199,0.595-0.275,0.966c-1.262,1.311-1.977,2.953-1.977,4.697v21.891 c0,2.426,1.314,4.619,3.408,5.893c0.334,0.713,0.703,1.307,1.143,1.746l1.012,1.012c1.322,1.324,3.08,2.054,4.949,2.054 c0,0,2.186,0,3.521,0c0,1.866,0,11.086,0,12.952c-1.275,0-3.225,0-3.225,0c-1.869,0-3.627,0.729-4.949,2.053l-2.023,2.021 c-1.324,1.326-2.053,3.084-2.053,4.947c0,0.041,0.002,0.082,0.006,0.121l0.049,0.473c0.004,0.039,0.01,0.076,0.018,0.113 l0.258,1.301c0.008,0.037,0.021,0.09,0.033,0.127l0.125,0.422c0.012,0.039,0.025,0.078,0.041,0.115 c1.088,2.631,3.629,4.332,6.473,4.332h12.488c2.842,0,5.381-1.697,6.467-4.324c0.016-0.035,0.031-0.082,0.043-0.119l0.133-0.434 c0.004-0.014,0.064-0.309,0.115-0.555c1.293-1.314,2.029-2.973,2.029-4.746V43.655c0-0.846-0.275-1.727-0.721-2.65 c0.445-0.924,0.721-1.805,0.721-2.65V16.464c0-1.744-0.715-3.385-1.971-4.693c-0.061-0.303-0.145-0.719-0.145-0.719 c-0.004-0.026-0.166-0.568-0.166-0.568c-0.012-0.04-0.023-0.07-0.039-0.109c-1.088-2.623-3.625-4.319-6.467-4.319H10.294z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.294,7.255c-2.355,0-4.461,1.408-5.361,3.586c-0.002,0.004-0.137,0.463-0.137,0.463 c0-0.006-0.123,0.613-0.203,1.014c-1.186,1.098-1.885,2.569-1.885,4.146v21.891c0,2.181,1.24,4.104,3.148,5.099 c0.283,0.677,0.617,1.257,1.051,1.692l1.012,1.012c1.096,1.097,2.553,1.701,4.102,1.701c0,0,3.195,0,4.721,0 c0,1.936,0,13.418,0,15.354c-1.484,0-4.424,0-4.424,0c-1.549,0-3.006,0.604-4.1,1.699l-2.025,2.023 c-1.096,1.098-1.699,2.555-1.699,4.098l0.047,0.473l0.26,1.301c-0.002-0.01,0.131,0.439,0.131,0.439 c0.902,2.186,3.006,3.592,5.363,3.592h12.488c2.354,0,4.457-1.406,5.359-3.584l0.137-0.445c0-0.004,0.086-0.43,0.15-0.756 c1.221-1.102,1.939-2.588,1.939-4.193V43.655c0-0.894-0.326-1.778-0.826-2.65c0.5-0.871,0.826-1.756,0.826-2.65V16.464 c0-1.58-0.699-3.053-1.885-4.149c-0.078-0.386-0.205-1.028-0.205-1.028c-0.002-0.005-0.139-0.453-0.139-0.453 c-0.9-2.173-3.004-3.578-5.357-3.578H10.294z M16.743,20.88c0,1.788,0,11.707-0.002,13.354c-0.199,0-0.207,0-0.408,0 c0-1.646-0.002-11.566-0.002-13.354C16.532,20.88,16.542,20.88,16.743,20.88z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.294,8.455c-1.869,0-3.537,1.116-4.252,2.844c-0.029,0.071-0.053,0.153-0.068,0.23 c0,0-0.27,1.354-0.275,1.376c-1.104,0.863-1.789,2.146-1.789,3.559v21.891c0,1.865,1.113,3.533,2.838,4.249 c0,0,0.037,0.009,0.043,0.011c0.219,0.645,0.514,1.23,0.967,1.683l1.012,1.013c0.869,0.869,2.023,1.349,3.252,1.349 c0,0,4.225,0,5.922,0c0,1.657,0,15.744,0,17.753c-1.631,0-5.625,0-5.625,0c-1.229,0-2.383,0.479-3.252,1.348l-2.023,2.023 c-0.871,0.873-1.35,2.025-1.35,3.25c0,0.08,0.008,0.158,0.023,0.234l0.26,1.305c0.016,0.076,0.039,0.152,0.068,0.225 c0.713,1.725,2.381,2.84,4.25,2.84h12.488c1.867,0,3.535-1.115,4.25-2.842c0.031-0.072,0.055-0.15,0.07-0.227 c0,0,0.166-0.838,0.221-1.113c1.137-0.861,1.846-2.162,1.846-3.596V43.655c0-0.99-0.408-1.872-0.982-2.65 c0.574-0.777,0.982-1.659,0.982-2.65V16.464c0-1.415-0.686-2.699-1.793-3.561c-0.004-0.021-0.275-1.384-0.275-1.384 c-0.016-0.077-0.037-0.152-0.068-0.226c-0.715-1.725-2.383-2.839-4.25-2.839H10.294z M17.944,19.68 c0,1.976-0.002,14.251-0.002,15.754c-1.014,0-1.795,0-2.809,0c0-1.504-0.002-13.778-0.002-15.754 C16.128,19.68,16.946,19.68,17.944,19.68z M15.134,36.331"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.294,9.655c-1.381,0-2.615,0.825-3.143,2.102l-0.26,1.303 c0,0.139,0.049,0.275,0.068,0.412c-1.123,0.584-1.852,1.713-1.852,2.992v21.891c0,1.379,0.824,2.611,2.098,3.141 c0.158,0.065,0.342,0.061,0.512,0.099c0.115,0.692,0.381,1.348,0.887,1.854l1.012,1.013c0.643,0.644,1.496,0.997,2.404,0.997 c0,0,4.932,0,7.162,0c-0.004,0.075-0.041,0.145-0.041,0.221c0,0,0,19.496,0,19.934c-1.979,0-6.824,0-6.824,0 c-0.908,0-1.762,0.354-2.402,0.994L7.89,68.632c-0.643,0.643-0.996,1.496-0.996,2.4l0.26,1.305c0.525,1.275,1.76,2.1,3.141,2.1 h12.488c1.381,0,2.613-0.826,3.143-2.102l0.26-1.303c0-0.063-0.047-0.127-0.051-0.191c1.111-0.584,1.834-1.707,1.834-2.982V43.655 c0-1.055-0.484-2.016-1.279-2.65c0.795-0.634,1.279-1.596,1.279-2.65V16.464c0-1.281-0.729-2.412-1.852-2.993 c0.02-0.138,0.068-0.274,0.068-0.413l-0.26-1.304c-0.529-1.274-1.762-2.099-3.143-2.099H10.294z M19.144,18.479 c0,0.003-0.002,17.852-0.002,17.852c0,0.104,0.049,0.199,0.059,0.303c-1.693,0-3.633,0-5.326,0c0.01-0.104,0.059-0.198,0.059-0.303 c0,0-0.002-17.849-0.002-17.852C15.544,18.479,17.532,18.479,19.144,18.479z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.294,10.855c-0.893,0-1.691,0.534-2.033,1.359c-0.113,0.273-0.168,0.56-0.168,0.845 c0,0.433,0.168,0.84,0.414,1.205c-0.281,0-0.566,0.055-0.84,0.167v0.001c-0.824,0.342-1.357,1.139-1.357,2.031v21.891 c0,0.893,0.533,1.689,1.357,2.032c0.41,0.17,0.84,0.169,1.256,0.088c-0.051,0.187-0.113,0.372-0.113,0.571 c0,0.587,0.229,1.139,0.645,1.555l1.012,1.012c0.416,0.416,0.967,0.646,1.555,0.646c0,0,8.574,0,8.877,0 c-0.346,0.399-0.555,0.89-0.555,1.421v20.156c0,0.35,0.104,0.674,0.256,0.977c-0.307,0-8.281,0-8.281,0 c-0.586,0-1.139,0.229-1.555,0.645l-2.023,2.023c-0.422,0.422-0.646,0.982-0.646,1.553c0,0.285,0.057,0.572,0.17,0.846 c0.34,0.824,1.139,1.357,2.031,1.357h12.488c0.895,0,1.691-0.533,2.033-1.359c0.113-0.273,0.17-0.561,0.17-0.844 c0-0.352-0.113-0.688-0.277-1c0.236-0.016,0.475-0.047,0.701-0.141c0.826-0.342,1.359-1.139,1.359-2.033V43.655 c0-0.894-0.533-1.691-1.359-2.033c-0.404-0.168-0.83-0.167-1.24-0.09c0.039-0.162,0.098-0.319,0.098-0.486 c0-0.199-0.063-0.385-0.113-0.571c0.416,0.081,0.846,0.083,1.256-0.087c0.826-0.342,1.359-1.139,1.359-2.033V16.464 c0-0.893-0.533-1.69-1.357-2.033c-0.273-0.112-0.559-0.166-0.84-0.167c0.246-0.365,0.412-0.772,0.412-1.206 c0-0.284-0.055-0.571-0.168-0.846c-0.342-0.822-1.139-1.356-2.033-1.356H10.294z M20.757,17.279 c-0.244,0.36-0.414,0.77-0.414,1.209v17.843c0,0.566,0.223,1.094,0.609,1.503c-0.197,0-8.633,0-8.83,0 c0.383-0.405,0.611-0.946,0.611-1.503V18.488c0-0.438-0.172-0.847-0.414-1.209C12.319,17.279,20.749,17.279,20.757,17.279z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.54" y1="4.33" x2="16.54" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.532,36.745l-4.023,4.023V14.05l4.023,4.024V36.745z M11.903,16.079L7.88,12.056h17.316 l-4.023,4.023H11.903z M21.173,68.013l4.023,4.023H7.88l4.023-4.023H21.173z M11.606,43.058l-2.012-2.013l2.012-2.011h9.861 l2.014,2.011l-2.014,2.013H11.606z M21.542,18.074l4.025-4.024v26.719l-4.025-4.023V18.074z M21.542,45.265l4.025-4.023v29.031 l-4.025-4.023V45.265z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_nine_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M11.965,36.681l-4.023,4.022V13.985l4.023,4.024V36.681z M12.336,16.015l-4.023-4.023h17.316 l-4.023,4.023H12.336z M21.605,67.947l4.023,4.023H8.313l4.023-4.023H21.605z M12.039,42.992l-2.012-2.012l2.012-2.012H21.9 l2.014,2.012L21.9,42.992H12.039z M21.975,18.01L26,13.985v26.718l-4.025-4.022V18.01z M21.975,45.199L26,41.176v29.031 l-4.025-4.023V45.199z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_one.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.389 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M18.75,8.655c0.076-0.076-2.021,2.02-2.021,2.02c-1.528,1.529-2.404,3.643-2.404,5.799 v19.837c0,1.681,0.583,3.349,1.577,4.739c-0.994,1.393-1.577,3.06-1.577,4.738v21.805c0,2.156,0.875,4.27,2.4,5.797l2.026,2.025 c2.355,2.354,5.862,3.051,8.936,1.779c3.077-1.277,5.064-4.252,5.064-7.578V43.765c0-0.852-0.232-1.754-0.621-2.715 c0.389-0.961,0.621-1.865,0.621-2.715V14.45c0-3.328-1.987-6.303-5.063-7.576C24.611,5.599,21.103,6.296,18.75,8.655z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M19.6,9.503c0.078-0.078-2.021,2.02-2.021,2.02c-1.305,1.307-2.053,3.11-2.053,4.951v19.837 c0,1.751,0.692,3.454,1.879,4.739c-1.187,1.287-1.879,2.989-1.879,4.738v21.805c0,1.84,0.747,3.645,2.049,4.949l2.026,2.025 c2.011,2.008,5.005,2.604,7.628,1.518c2.627-1.09,4.323-3.629,4.323-6.469V43.765c0-0.896-0.265-1.794-0.692-2.715 c0.428-0.922,0.692-1.82,0.692-2.715V14.45c0-2.842-1.696-5.38-4.321-6.467C24.604,6.894,21.608,7.489,19.6,9.503z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M20.449,10.351c0.076-0.078-2.023,2.021-2.023,2.021c-1.08,1.081-1.7,2.576-1.7,4.102 v19.837c0,1.525,0.619,3.02,1.698,4.101c0,0,0.326,0.326,0.639,0.639c-0.297,0.297-0.637,0.637-0.637,0.637 c-1.08,1.081-1.7,2.576-1.7,4.102v21.805c0,1.525,0.619,3.02,1.698,4.1l2.025,2.025c1.666,1.664,4.146,2.158,6.32,1.258 c2.176-0.902,3.582-3.006,3.582-5.359V43.765c0-0.961-0.315-1.868-0.787-2.715c0.472-0.848,0.787-1.756,0.787-2.715V14.45 c0-2.354-1.405-4.457-3.58-5.357C24.596,8.189,22.113,8.683,20.449,10.351z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M21.298,11.198c0.083-0.084-2.022,2.021-2.022,2.021c-0.857,0.858-1.35,2.044-1.35,3.254 v19.837c0,1.21,0.491,2.396,1.348,3.252c0,0,0.926,0.926,1.501,1.501c-0.165,0.16-0.293,0.265-0.487,0.459l-1.012,1.012 c-0.857,0.858-1.35,2.044-1.35,3.254v21.805c0,1.209,0.491,2.395,1.348,3.252l2.024,2.025c1.321,1.32,3.289,1.711,5.013,0.996 c1.727-0.715,2.841-2.383,2.841-4.25V43.765c0-1.002-0.343-1.936-0.931-2.715c0.588-0.78,0.931-1.715,0.931-2.715V14.45 c0-1.867-1.114-3.535-2.839-4.25C24.586,9.485,22.618,9.876,21.298,11.198z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M22.146,12.046C22.146,12.046,22.146,12.046,22.146,12.046l-2.023,2.023 c-0.634,0.634-0.997,1.51-0.997,2.404v19.837c0,0.894,0.363,1.771,0.996,2.404l2.024,2.024c0.137,0.136,0.313,0.201,0.466,0.311 c-0.153,0.109-0.329,0.174-0.466,0.311c0,0,0,0,0.001,0l-2.024,2.023c-0.634,0.634-0.997,1.51-0.997,2.404v21.805 c0,0.895,0.363,1.771,0.996,2.404l2.024,2.023c0.977,0.977,2.432,1.266,3.705,0.738c1.275-0.529,2.1-1.762,2.1-3.143V43.765 c0-1.098-0.535-2.084-1.389-2.715c0.854-0.631,1.389-1.619,1.389-2.715V14.45c0-1.38-0.824-2.613-2.099-3.141 C24.577,10.78,23.122,11.069,22.146,12.046z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M22.996,12.894l-2.025,2.023c-0.409,0.41-0.645,0.978-0.645,1.557v19.837 c0,0.579,0.235,1.146,0.645,1.556l2.024,2.023c0.632,0.632,1.573,0.818,2.397,0.477c0.825-0.342,1.358-1.139,1.358-2.031V14.45 c0-0.894-0.533-1.691-1.358-2.033C24.568,12.075,23.627,12.263,22.996,12.894z M22.996,42.208l-2.025,2.023 c-0.409,0.41-0.645,0.978-0.645,1.557v21.805c0,0.58,0.235,1.146,0.645,1.557l2.024,2.023c0.632,0.631,1.573,0.818,2.397,0.477 c0.825-0.342,1.358-1.139,1.358-2.033V43.765c0-0.894-0.533-1.691-1.358-2.033C24.568,41.39,23.627,41.577,22.996,42.208z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="23.54" y1="4.33" x2="23.54" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M21.526,16.06l4.024-4.023v28.712l-4.024-4.023V16.06z M21.526,45.374l4.024-4.023v30.68 l-4.024-4.023V45.374z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_one_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M21.915,15.995l4.024-4.023v28.712l-4.024-4.023V15.995z M21.915,45.309l4.024-4.023v30.68l-4.024-4.023 V45.309z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_seven.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.598 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.113,4.852c-3.332,0-6.307,1.989-7.58,5.069c-1.271,3.072-0.572,6.578,1.781,8.93 l2.023,2.023c1.547,1.549,3.607,2.402,5.797,2.402c0,0,1.088,0,2.037,0c0,2.043,0,14.338,0,14.338c0,1.42,0.457,2.775,1.18,4.02 c-0.717,1.248-1.18,2.62-1.18,3.994v19.967c0,2.156,0.877,4.27,2.404,5.797l2.021,2.023c2.35,2.354,5.857,3.053,8.936,1.779 c3.076-1.279,5.064-4.252,5.064-7.576V43.604c0-0.701-0.188-1.479-0.498-2.328c0.311-0.853,0.498-1.637,0.498-2.346V16.422 c0-1.895-0.748-3.727-2.072-5.228c-0.037-0.187-0.076-0.381-0.076-0.381c-0.006-0.035-0.041-0.053-0.051-0.086 c-0.057-0.236-0.123-0.521-0.123-0.521c-0.014-0.062-0.072-0.229-0.096-0.288V9.918c-1.281-3.081-4.254-5.066-7.578-5.066H10.113z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.113,6.052c-2.844,0-5.385,1.699-6.471,4.327c-1.086,2.622-0.49,5.615,1.52,7.624 l2.023,2.023c1.322,1.321,3.08,2.05,4.949,2.05c0,0,1.961,0,3.238,0c0,2.067,0,15.538,0,15.538c0,1.456,0.471,2.842,1.309,4.018 c-0.83,1.178-1.309,2.58-1.309,3.996v19.967c0,1.84,0.748,3.645,2.051,4.949l2.023,2.023c2.006,2.008,5,2.605,7.627,1.518 c2.627-1.092,4.324-3.629,4.324-6.467V43.604c0-0.727-0.213-1.503-0.559-2.326c0.346-0.828,0.559-1.61,0.559-2.348V16.422 c0-1.755-0.723-3.401-1.994-4.714c-0.057-0.289-0.131-0.66-0.131-0.66c-0.004-0.014,0.025,0.248,0.023,0.235l-0.189-0.802 c-0.016-0.063-0.016-0.052-0.039-0.111c-1.092-2.623-3.629-4.318-6.467-4.318H10.113z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.113,7.252c-2.357,0-4.461,1.407-5.361,3.585c-0.9,2.172-0.406,4.652,1.26,6.316 l2.023,2.023c1.094,1.096,2.551,1.699,4.1,1.699c0,0,2.951,0,4.438,0c0,2.09,0,16.738,0,16.738c0,1.523,0.602,2.945,1.633,4.014 c-1.027,1.074-1.633,2.516-1.633,4v19.967c0,1.525,0.621,3.02,1.701,4.102l2.021,2.023c1.662,1.664,4.145,2.156,6.32,1.258 c2.178-0.906,3.582-3.01,3.582-5.359V43.604c0-0.769-0.248-1.539-0.637-2.324c0.389-0.791,0.637-1.568,0.637-2.35V16.422 c0-1.59-0.707-3.069-1.908-4.167c-0.074-0.376-0.193-0.972-0.193-0.972l-0.137-0.453c-0.902-2.173-3.006-3.578-5.357-3.578H10.113z "/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.113,8.452c-1.869,0-3.539,1.116-4.252,2.844c-0.715,1.723-0.322,3.688,0.998,5.01 l2.023,2.023c0.869,0.868,2.023,1.347,3.252,1.347c0,0,4.006,0,5.639,0c0,2.108,0,17.938,0,17.938c0,1.564,0.783,3.006,2.096,3.857 c0,0,0.063,0.042,0.094,0.063c-0.416,0.415-0.842,0.84-0.842,0.84c-0.855,0.857-1.348,2.043-1.348,3.254v19.967 c0,1.209,0.492,2.396,1.348,3.252l2.023,2.023c1.318,1.32,3.285,1.711,5.012,0.998c1.727-0.719,2.842-2.387,2.842-4.25V43.604 c0-0.83-0.311-1.607-0.754-2.323c0.443-0.718,0.754-1.501,0.754-2.351V16.422c0-1.423-0.695-2.714-1.814-3.576 c-0.002-0.011-0.264-1.329-0.264-1.329c-0.016-0.077-0.039-0.152-0.068-0.226c-0.717-1.725-2.385-2.839-4.25-2.839H10.113z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.113,9.652c-1.383,0-2.615,0.825-3.143,2.102c-0.527,1.272-0.238,2.726,0.738,3.702 l2.023,2.023c0.641,0.643,1.494,0.996,2.402,0.996c0,0,4.746,0,6.838,0c0,0.059,0,19.139,0,19.139c0,1.156,0.58,2.222,1.549,2.852 c0,0,0.738,0.48,1.336,0.869c-0.232,0.234-1.887,1.889-1.887,1.889c-0.635,0.633-0.998,1.51-0.998,2.404v19.967 c0,0.895,0.363,1.77,0.998,2.404l2.021,2.023c0.975,0.975,2.43,1.264,3.705,0.736c1.275-0.529,2.1-1.764,2.1-3.141V43.604 c0-0.894-0.373-1.703-0.963-2.322c0.602-0.625,0.963-1.457,0.963-2.352V16.422c0-1.282-0.73-2.413-1.854-2.995 c0.016-0.123,0.059-0.247,0.059-0.371l-0.26-1.305c-0.529-1.275-1.764-2.099-3.141-2.099H10.113z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.113,10.853c-0.895,0-1.693,0.533-2.033,1.359c-0.342,0.822-0.154,1.764,0.477,2.396 l2.023,2.023c0.416,0.414,0.969,0.644,1.555,0.644c0,0,8.395,0,8.428,0c-0.229,0.354-0.389,0.748-0.389,1.171v19.168 c0,0.748,0.375,1.438,1.002,1.846l2.021,1.314c0.676,0.441,1.539,0.476,2.248,0.09c0.711-0.385,1.152-1.125,1.152-1.934V16.422 c0-0.893-0.533-1.69-1.357-2.032c-0.27-0.111-0.549-0.162-0.828-0.165c0.232-0.356,0.391-0.751,0.391-1.169 c0-0.285-0.057-0.572-0.17-0.846c-0.342-0.824-1.141-1.357-2.031-1.357H10.113z M22.842,14.867l-0.002,0.001 C22.84,14.868,22.84,14.868,22.842,14.867z M22.84,42.05c-0.002,0.002-2.021,2.021-2.021,2.021c-0.41,0.41-0.645,0.979-0.645,1.557 v19.967c0,0.578,0.234,1.145,0.645,1.555l2.023,2.023c0.631,0.631,1.572,0.818,2.396,0.477c0.826-0.342,1.359-1.139,1.359-2.031 V43.604c0-0.893-0.533-1.689-1.357-2.032C24.412,41.229,23.471,41.418,22.84,42.05z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.55" y1="4.33" x2="16.55" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.721,16.075l-4.023-4.022h17.318l-4.023,4.022H11.721z M21.373,18.032l4.023-4.025v26.768 l-4.023-2.617V18.032z M21.373,45.214l4.023-4.023v28.842l-4.023-4.023V45.214z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_seven_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.318,16.011l-4.023-4.022h17.318l-4.023,4.022H12.318z M21.971,17.968l4.023-4.025v26.767 l-4.023-2.616V17.968z M21.971,45.148l4.023-4.023v28.842l-4.023-4.023V45.148z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_six.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.059 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.671,4.866c-3.331,0-6.306,1.99-7.579,5.07c-0.013,0.032-0.035,0.101-0.046,0.134 l-0.165,0.524c-0.013,0.04-0.051,0.191-0.06,0.232c0,0-0.071,0.356-0.123,0.615c-1.261,1.486-1.974,3.281-1.974,5.12v21.792 c0,0.8,0.235,1.675,0.624,2.621c-0.389,0.945-0.624,1.82-0.624,2.62v23.95c0,1.84,0.715,3.637,1.979,5.123 c0.051,0.256,0.118,0.598,0.118,0.598c-0.003-0.02,0.059,0.232,0.059,0.232l0.127,0.424c0.001,0.004,0.084,0.236,0.084,0.236 c1.271,3.076,4.247,5.068,7.579,5.068h12.49c3.329,0,6.303-1.988,7.575-5.066l0.077-0.213l0.138-0.447 c0.001-0.002,0.06-0.236,0.06-0.236s0.059-0.297,0.105-0.533c1.297-1.492,2.031-3.311,2.031-5.186v-23.95 c0-2.745-1.426-5.222-3.784-6.75c-0.354-0.656-0.721-1.196-1.12-1.597l-1.013-1.013c-1.549-1.55-3.607-2.403-5.798-2.403 c0,0-1.251,0-2.281,0c0-1.668,0-6.875,0-8.543c0.933,0,1.986,0,1.986,0c2.19,0,4.25-0.854,5.798-2.404l2.02-2.018 c1.553-1.552,2.408-3.611,2.408-5.798c0-1.081-0.212-2.14-0.629-3.146c-1.268-3.072-4.241-5.059-7.574-5.059H10.671z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.671,6.066c-2.844,0-5.383,1.699-6.47,4.329l0,0c0,0.008-0.177,0.563-0.177,0.563 c-0.014,0.043-0.019,0.067-0.027,0.111c0,0-0.109,0.546-0.176,0.876c-1.209,1.302-1.896,2.915-1.896,4.617v21.792 c0,0.833,0.268,1.705,0.7,2.621c-0.433,0.916-0.7,1.787-0.7,2.62v23.95c0,1.703,0.688,3.318,1.901,4.621 c0.065,0.33,0.172,0.863,0.172,0.863c0.007,0.037,0.021,0.09,0.032,0.127l0.126,0.422c0.012,0.039,0.025,0.078,0.041,0.115 c1.088,2.631,3.628,4.332,6.473,4.332h12.49c2.841,0,5.38-1.697,6.467-4.324c0.015-0.035,0.031-0.082,0.043-0.119l0.133-0.434 c0.012-0.039,0.021-0.078,0.029-0.117c0,0,0.097-0.486,0.161-0.811c1.246-1.307,1.953-2.941,1.953-4.676v-23.95 c0-2.479-1.354-4.699-3.509-5.958c-0.317-0.628-0.657-1.152-1.044-1.54l-1.013-1.013c-1.322-1.323-3.08-2.052-4.949-2.052 c0,0-2.154,0-3.481,0c0-1.791,0-9.152,0-10.943c1.267,0,3.187,0,3.187,0c1.87,0,3.628-0.729,4.949-2.052l2.021-2.019 c1.326-1.325,2.056-3.083,2.056-4.949c0-0.923-0.181-1.826-0.537-2.686c-1.082-2.622-3.62-4.318-6.466-4.318H10.671z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.671,7.267c-2.356,0-4.461,1.408-5.361,3.588c-0.002,0.004-0.136,0.449-0.136,0.449 s-0.195,0.979-0.235,1.176c-1.141,1.093-1.813,2.541-1.813,4.083v21.792c0,0.88,0.316,1.756,0.802,2.621 c-0.485,0.865-0.802,1.74-0.802,2.62v23.95c0,1.543,0.675,2.992,1.818,4.086c0.042,0.213,0.231,1.164,0.231,1.164 c-0.002-0.01,0.132,0.439,0.132,0.439c0.902,2.186,3.006,3.592,5.363,3.592h12.49c2.354,0,4.457-1.406,5.358-3.584l0.137-0.445 c0,0,0.168-0.842,0.223-1.117c1.176-1.096,1.868-2.563,1.868-4.135v-23.95c0-2.213-1.272-4.169-3.23-5.148 c-0.274-0.599-0.585-1.115-0.971-1.501l-1.013-1.014c-1.096-1.096-2.552-1.699-4.101-1.699c0,0-3.161,0-4.682,0 c0-1.879,0-11.465,0-13.344c1.479,0,4.387,0,4.387,0c1.55,0,3.006-0.604,4.101-1.699l2.021-2.02c1.099-1.1,1.703-2.555,1.703-4.101 c0-0.766-0.15-1.515-0.445-2.226c-0.896-2.173-3-3.578-5.357-3.578H10.671z M17.121,47.858c0,1.936,0,13.41,0,15.344 c-0.043,0-0.328,0-0.371,0c0-1.936,0-13.408,0-15.344C16.933,47.858,16.938,47.858,17.121,47.858z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.671,8.467c-1.869,0-3.538,1.117-4.252,2.845c-0.029,0.072-0.054,0.157-0.069,0.233 l-0.258,1.29c-0.019,0.091-0.031,0.105-0.031,0.15c0,0.012,0.003,0.035,0.005,0.057c-1.075,0.863-1.74,2.131-1.74,3.521v21.792 c0,0.977,0.396,1.849,0.949,2.621c-0.554,0.771-0.949,1.645-0.949,2.62v23.95c0,1.389,0.665,2.656,1.739,3.52 c-0.001,0.014-0.004,0.033-0.004,0.043c0,0.045,0.013,0.059,0.031,0.148l0.26,1.305c0.015,0.076,0.038,0.152,0.067,0.225 c0.713,1.725,2.382,2.84,4.251,2.84h12.49c1.867,0,3.535-1.115,4.25-2.842c0.03-0.072,0.054-0.15,0.069-0.227l0.26-1.301 c0.019-0.09,0.031-0.105,0.031-0.15c0,0-0.001-0.008-0.001-0.01c1.098-0.861,1.776-2.141,1.776-3.551v-23.95 c0-1.865-1.114-3.532-2.838-4.249c0,0-0.041-0.01-0.099-0.023c-0.223-0.588-0.505-1.12-0.913-1.529l-1.013-1.013 c-0.869-0.869-2.023-1.348-3.252-1.348c0,0-4.174,0-5.882,0c0-1.512,0-13.909,0-15.744c1.642,0,5.587,0,5.587,0 c1.229,0,2.384-0.479,3.252-1.348l2.022-2.021c0.871-0.871,1.351-2.026,1.351-3.251c0-0.607-0.119-1.202-0.354-1.767 c-0.711-1.723-2.379-2.837-4.249-2.837H10.671z M18.321,46.658c0,1.755,0,15.86,0,17.745c-0.689,0-2.081,0-2.771,0 c0-1.883,0-15.989,0-17.745C16.546,46.658,17.325,46.658,18.321,46.658z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.671,9.667c-1.382,0-2.615,0.826-3.143,2.104l-0.26,1.299 c0,0.172,0.061,0.341,0.09,0.512c-1.111,0.586-1.833,1.709-1.833,2.981v21.792c0,1.034,0.464,1.986,1.233,2.621 c-0.771,0.635-1.233,1.586-1.233,2.62v23.95c0,1.271,0.721,2.395,1.83,2.979c-0.028,0.168-0.087,0.332-0.087,0.498l0.26,1.305 c0.526,1.275,1.76,2.1,3.142,2.1h12.49c1.381,0,2.613-0.826,3.142-2.102l0.261-1.303c0-0.16-0.058-0.316-0.083-0.477 c1.131-0.58,1.866-1.715,1.866-3v-23.95c0-1.379-0.823-2.611-2.098-3.141c-0.168-0.069-0.362-0.065-0.542-0.104 c-0.135-0.635-0.388-1.236-0.858-1.708l-1.013-1.013c-0.642-0.643-1.495-0.996-2.403-0.996c0,0-4.882,0-7.141,0 c0.009-0.104,0.059-0.198,0.059-0.303V18.587c0-0.033-0.017-0.064-0.018-0.098c2.129,0,6.805,0,6.805,0 c0.908,0,1.762-0.354,2.403-0.996l2.022-2.021c0.652-0.653,0.999-1.519,0.999-2.402c0-0.438-0.086-0.883-0.262-1.306 c-0.525-1.273-1.759-2.098-3.141-2.098H10.671z M19.551,45.458c-0.003,0.055-0.029,0.106-0.029,0.161v19.903 c0,0.025,0.014,0.053,0.015,0.08c-1.598,0-3.567,0-5.201,0c0.001-0.027,0.015-0.053,0.015-0.08V45.619 c0-0.055-0.026-0.106-0.029-0.161C15.969,45.458,17.902,45.458,19.551,45.458z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.671,10.867c-0.895,0-1.692,0.534-2.033,1.36c-0.113,0.273-0.169,0.559-0.169,0.842 c0,0.469,0.187,0.911,0.474,1.295c-0.288-0.002-0.58,0.051-0.858,0.166H8.083c-0.824,0.342-1.357,1.14-1.357,2.032v21.792 c0,0.893,0.533,1.689,1.357,2.032c0.397,0.164,0.813,0.166,1.215,0.096c-0.05,0.185-0.111,0.367-0.111,0.563 c0,0.145,0.055,0.277,0.082,0.416c-0.394-0.063-0.798-0.059-1.185,0.102H8.083c-0.824,0.342-1.357,1.14-1.357,2.032v23.95 c0,0.893,0.533,1.689,1.357,2.031c0.275,0.113,0.563,0.168,0.848,0.168c-0.279,0.381-0.462,0.816-0.462,1.277 c0,0.285,0.056,0.572,0.169,0.846c0.34,0.824,1.139,1.357,2.032,1.357h12.49c0.894,0,1.691-0.533,2.033-1.359 c0.113-0.273,0.169-0.561,0.169-0.844c0-0.465-0.185-0.904-0.469-1.287c0.3,0.008,0.604-0.037,0.894-0.158 c0.825-0.342,1.358-1.139,1.358-2.031v-23.95c0-0.893-0.533-1.69-1.357-2.032c-0.401-0.166-0.822-0.167-1.229-0.094 c0.028-0.141,0.084-0.275,0.084-0.424c0-0.588-0.229-1.14-0.645-1.555l-1.013-1.014c-0.415-0.415-0.967-0.644-1.555-0.644 c0,0-8.62,0-8.893,0c0.383-0.405,0.61-0.946,0.61-1.503V18.587c0-0.477-0.191-0.923-0.477-1.303 c0.007,0.001,0.014,0.005,0.021,0.005h8.443c0.587,0,1.14-0.229,1.555-0.644l2.022-2.021c0.633-0.633,0.82-1.574,0.478-2.399 c-0.34-0.823-1.138-1.357-2.032-1.357H10.671z M23.39,42.04L23.39,42.04L23.39,42.04z M21.237,44.258 c-0.312,0.389-0.516,0.861-0.516,1.361v19.903c0,0.471,0.189,0.912,0.469,1.291c-0.019-0.002-0.035-0.012-0.054-0.012 c0,0-8.447,0.002-8.45,0.002c0.275-0.377,0.463-0.814,0.463-1.281V45.619c0-0.5-0.204-0.973-0.516-1.361 C13.069,44.258,20.876,44.258,21.237,44.258z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.94" y1="4.33" x2="16.94" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.949,36.745l-4.023,4.023V14.147l4.023,4.025V36.745z M11.949,65.937L7.926,69.96V41.182 l4.023,4.023V65.937z M12.279,16.089l-4.023-4.021h17.318l-4.023,4.021H12.279z M21.551,68.003l4.023,4.023H8.256l4.023-4.023 H21.551z M11.984,43.058l-2.012-2.012l2.012-2.012h9.861l2.012,2.012l-2.012,2.012H11.984z M21.922,45.205l4.023-4.023V69.96 l-4.023-4.023V45.205z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_six_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.008,36.681l-4.023,4.022v-26.62l4.023,4.025V36.681z M12.008,65.871l-4.023,4.023V41.117l4.023,4.023 V65.871z M12.338,16.024l-4.023-4.021h17.318l-4.023,4.021H12.338z M21.609,67.938l4.023,4.023H8.314l4.023-4.023H21.609z M12.043,42.992l-2.012-2.012l2.012-2.012h9.861l2.012,2.012l-2.012,2.012H12.043z M21.98,45.141l4.023-4.023v28.777 l-4.023-4.023V45.141z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_stop.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="12" height="86" viewBox="-0.491 0.065 12 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M3.549,62.964c-1.081,0-2.067,0.414-2.848,1.199c-0.779,0.775-1.192,1.762-1.192,2.854 v3.928c0,1.088,0.413,2.074,1.192,2.855c0.781,0.783,1.765,1.195,2.848,1.195h3.92c1.081,0,2.064-0.412,2.844-1.191 c0.783-0.785,1.196-1.773,1.196-2.859v-3.928c0-1.082-0.411-2.068-1.19-2.852c-0.787-0.787-1.772-1.201-2.85-1.201H3.549z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M3.549,63.464c-0.946,0-1.81,0.363-2.495,1.053c-0.684,0.68-1.046,1.545-1.046,2.5v3.928 c0,0.951,0.362,1.816,1.046,2.502c0.686,0.688,1.549,1.049,2.495,1.049h3.92c0.946,0,1.808-0.361,2.493-1.047 c0.686-0.688,1.048-1.555,1.048-2.504v-3.928c0-0.947-0.36-1.813-1.044-2.498c-0.691-0.691-1.555-1.055-2.497-1.055H3.549z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M3.549,63.964c-0.81,0-1.552,0.313-2.143,0.906c-0.588,0.584-0.9,1.328-0.9,2.146v3.928 c0,0.816,0.312,1.559,0.9,2.148s1.331,0.902,2.143,0.902h3.92c0.811,0,1.551-0.311,2.141-0.9c0.59-0.592,0.902-1.336,0.902-2.15 v-3.928c0-0.813-0.311-1.555-0.898-2.146c-0.594-0.594-1.336-0.906-2.145-0.906H3.549z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M3.549,64.464c-0.676,0-1.295,0.262-1.79,0.758c-0.493,0.49-0.754,1.111-0.754,1.795v3.928 c0,0.68,0.261,1.301,0.754,1.795s1.112,0.756,1.79,0.756h3.92c0.676,0,1.295-0.26,1.788-0.754c0.495-0.496,0.756-1.119,0.756-1.797 v-3.928c0-0.678-0.259-1.297-0.752-1.793c-0.499-0.498-1.118-0.76-1.792-0.76H3.549z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M3.549,64.964c-0.542,0-1.038,0.213-1.438,0.611c-0.397,0.396-0.608,0.895-0.608,1.441 v3.928c0,0.545,0.21,1.043,0.608,1.441s0.896,0.609,1.438,0.609h3.92c0.541,0,1.038-0.211,1.436-0.607 c0.399-0.402,0.609-0.9,0.609-1.443v-3.928c0-0.541-0.21-1.039-0.607-1.439c-0.401-0.402-0.898-0.613-1.438-0.613H3.549z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M3.549,65.464c-0.405,0-0.781,0.162-1.083,0.465c-0.302,0.301-0.463,0.678-0.463,1.088 v3.928c0,0.41,0.16,0.785,0.461,1.088c0.306,0.307,0.672,0.463,1.085,0.463h3.92c0.407,0,0.781-0.16,1.083-0.461 c0.304-0.307,0.464-0.682,0.464-1.09v-3.928c0-0.406-0.16-0.783-0.462-1.086c-0.306-0.307-0.68-0.467-1.085-0.467H3.549z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="5.51" y1="4.33" x2="5.51" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M3.549,71.995c-0.276,0-0.522-0.104-0.732-0.316c-0.21-0.211-0.315-0.457-0.315-0.734v-3.928 c0-0.277,0.105-0.523,0.315-0.734c0.21-0.211,0.456-0.318,0.732-0.318h3.92c0.276,0,0.52,0.107,0.732,0.318 c0.21,0.211,0.315,0.457,0.315,0.734v3.928c0,0.277-0.105,0.523-0.315,0.734c-0.213,0.213-0.456,0.316-0.732,0.316H3.549z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_stop_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="12" height="86" viewBox="0 0 12 86">
-<rect width="12" height="86"/>
-<path fill="#FFFFFF" d="M4.035,71.93c-0.277,0-0.523-0.104-0.734-0.316c-0.211-0.211-0.316-0.457-0.316-0.734v-3.928 c0-0.277,0.105-0.523,0.316-0.734s0.457-0.318,0.734-0.318h3.93c0.277,0,0.521,0.107,0.734,0.318 c0.211,0.211,0.316,0.457,0.316,0.734v3.928c0,0.277-0.105,0.523-0.316,0.734c-0.213,0.213-0.457,0.316-0.734,0.316H4.035z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_three.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.685 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.026,4.87c-3.328,0-6.301,1.987-7.575,5.062c-1.271,3.072-0.577,6.576,1.77,8.93 l2.03,2.031c1.551,1.549,3.61,2.402,5.799,2.402c0,0,1.079,0,2.025,0c0,1.668,0,6.875,0,8.543c-1.043,0-2.32,0-2.32,0 c-2.189,0-4.248,0.854-5.798,2.402l-1.011,1.011c-1.551,1.546-2.404,3.605-2.404,5.799c0,2.189,0.854,4.248,2.402,5.799 l1.012,1.012c1.551,1.551,3.61,2.403,5.799,2.403c0,0,1.277,0,2.32,0c0,1.773,0,8.769,0,10.542c-0.946,0-2.025,0-2.025,0 c-2.189,0-4.249,0.854-5.799,2.403l-2.023,2.023c-1.551,1.554-2.404,3.61-2.404,5.794c0,1.083,0.212,2.142,0.629,3.146 c1.275,3.074,4.248,5.061,7.574,5.061h12.49c3.328,0,6.301-1.987,7.575-5.063c-0.001,0.002,0.077-0.215,0.077-0.215l0.136-0.445 l0,0c0-0.002,0.059-0.229,0.059-0.229s0.058-0.291,0.104-0.523c1.299-1.495,2.033-3.314,2.033-5.188V43.61 c0-0.803-0.236-1.68-0.627-2.625c0.391-0.947,0.627-1.824,0.627-2.626V16.466c0-1.884-0.741-3.708-2.051-5.206 c-0.041-0.203-0.085-0.426-0.085-0.426c-0.001-0.007-0.063-0.246-0.063-0.246l-0.134-0.438c-0.003-0.013-0.08-0.227-0.08-0.227 c-1.272-3.068-4.246-5.054-7.572-5.054H10.026z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.026,6.07c-2.841,0-5.379,1.696-6.467,4.321c-1.084,2.621-0.492,5.613,1.512,7.623 L7.1,20.044c1.323,1.322,3.081,2.051,4.95,2.051c0,0,1.951,0,3.226,0c0,1.791,0,9.152,0,10.943c-1.335,0-3.521,0-3.521,0 c-1.869,0-3.627,0.729-4.949,2.051L5.794,36.1c-1.322,1.319-2.052,3.077-2.052,4.95c0,1.87,0.729,3.627,2.051,4.95l1.013,1.013 c1.322,1.322,3.081,2.051,4.949,2.051c0,0,2.186,0,3.521,0c0,1.866,0,11.076,0,12.942c-1.274,0-3.226,0-3.226,0 c-1.869,0-3.627,0.729-4.949,2.052l-2.024,2.023c-1.323,1.326-2.052,3.082-2.052,4.945c0,0.924,0.18,1.828,0.536,2.686 c1.088,2.623,3.626,4.32,6.466,4.32h12.49c2.842,0,5.379-1.697,6.467-4.322c0.014-0.035,0.031-0.086,0.043-0.121l0.131-0.43 c0.012-0.037,0.021-0.076,0.029-0.115c0,0,0.095-0.477,0.158-0.797c1.248-1.309,1.956-2.943,1.956-4.68V43.61 c0-0.836-0.269-1.709-0.703-2.625c0.435-0.918,0.703-1.791,0.703-2.626V16.466c0-1.744-0.714-3.385-1.972-4.694 c-0.061-0.298-0.141-0.703-0.141-0.703c-0.008-0.038-0.021-0.09-0.033-0.128l-0.134-0.441c-0.012-0.037-0.024-0.075-0.04-0.111 c-1.088-2.623-3.625-4.317-6.465-4.317H10.026z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.026,7.271c-2.354,0-4.457,1.405-5.357,3.58c-0.899,2.173-0.407,4.652,1.252,6.317 l2.027,2.027c1.097,1.096,2.553,1.699,4.102,1.699c0,0,2.94,0,4.426,0c0,1.879,0,11.465,0,13.344c-1.525,0-4.721,0-4.721,0 c-1.549,0-3.006,0.604-4.102,1.699l-1.01,1.011c-1.097,1.093-1.701,2.551-1.701,4.102c0,1.549,0.604,3.006,1.699,4.102l1.012,1.012 c1.098,1.097,2.554,1.7,4.102,1.7c0,0,3.195,0,4.721,0c0,1.935,0,13.408,0,15.343c-1.485,0-4.426,0-4.426,0 c-1.549,0-3.006,0.604-4.102,1.699l-2.023,2.023c-1.097,1.1-1.701,2.555-1.701,4.098c0,0.766,0.15,1.516,0.445,2.227 c0.901,2.174,3.004,3.578,5.357,3.578h12.49c2.354,0,4.457-1.404,5.357-3.58l0.136-0.443c0,0,0.162-0.811,0.22-1.104 c1.178-1.096,1.871-2.563,1.871-4.137V43.61c0-0.883-0.318-1.76-0.805-2.625c0.486-0.867,0.805-1.744,0.805-2.626V16.466 c0-1.58-0.699-3.053-1.887-4.15c-0.076-0.377-0.202-1.013-0.202-1.013l-0.139-0.455c-0.9-2.171-3.003-3.577-5.356-3.577H10.026z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.026,8.471c-1.866,0-3.534,1.114-4.248,2.839c-0.714,1.724-0.324,3.689,0.992,5.012 l2.026,2.025c0.87,0.869,2.024,1.348,3.253,1.348c0,0,3.996,0,5.626,0c0,1.975,0,14.24,0,15.744c-1.712,0-5.921,0-5.921,0 c-1.229,0-2.383,0.479-3.252,1.348l-1.012,1.011c-0.869,0.866-1.349,2.022-1.349,3.253c0,1.229,0.479,2.384,1.348,3.253 l1.013,1.013c0.869,0.869,2.024,1.348,3.252,1.348c0,0,4.233,0,5.921,0c0,1.739,0,15.832,0,17.744c-1.64,0-5.626,0-5.626,0 c-1.229,0-2.383,0.479-3.252,1.348l-2.024,2.023c-0.87,0.871-1.349,2.025-1.349,3.248c0,0.607,0.119,1.203,0.353,1.766 c0.715,1.725,2.383,2.84,4.249,2.84h12.49c1.867,0,3.535-1.115,4.249-2.84c0.03-0.072,0.053-0.148,0.068-0.225l0.261-1.305 c0.018-0.088,0.029-0.104,0.029-0.145c1.098-0.861,1.776-2.141,1.776-3.551V43.61c0-0.979-0.397-1.853-0.954-2.625 c0.557-0.773,0.954-1.648,0.954-2.626V16.466c0-1.415-0.687-2.699-1.793-3.562c-0.005-0.02-0.272-1.368-0.272-1.368 c-0.016-0.076-0.039-0.152-0.068-0.225c-0.716-1.726-2.385-2.841-4.25-2.841H10.026z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.026,9.671c-1.379,0-2.611,0.824-3.141,2.099c-0.527,1.274-0.238,2.728,0.735,3.704 l2.024,2.024c0.643,0.642,1.496,0.996,2.404,0.996c0,0,4.724,0,6.826,0c0,0.009,0,17.842,0,17.842c0,0.104,0.049,0.2,0.059,0.303 c-2.263,0-7.18,0-7.18,0c-0.908,0-1.762,0.354-2.404,0.996L8.34,38.646c-0.642,0.641-0.997,1.494-0.997,2.404 c0,0.908,0.354,1.762,0.996,2.404l1.012,1.013c0.643,0.642,1.496,0.996,2.404,0.996c0,0,4.941,0,7.152,0 c-0.004,0.058-0.031,0.112-0.031,0.171v19.91c0,0.021,0.01,0.041,0.011,0.063c-2.106,0-6.837,0-6.837,0 c-0.908,0-1.762,0.354-2.404,0.996l-2.023,2.023c-0.652,0.652-0.998,1.518-0.998,2.4c0,0.439,0.086,0.883,0.262,1.307 c0.528,1.273,1.761,2.098,3.141,2.098h12.49c1.379,0,2.612-0.824,3.141-2.098l0.261-1.305c0-0.154-0.056-0.309-0.08-0.463 c1.13-0.58,1.862-1.713,1.862-2.998V43.61c0-1.037-0.467-1.991-1.24-2.625c0.773-0.635,1.24-1.589,1.24-2.626V16.466 c0-1.28-0.729-2.409-1.848-2.99c0.018-0.135,0.064-0.268,0.064-0.402l-0.26-1.303c-0.529-1.275-1.762-2.1-3.141-2.1H10.026z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.026,10.871c-0.893,0-1.689,0.533-2.031,1.358c-0.342,0.824-0.154,1.765,0.476,2.396 l2.023,2.023c0.415,0.416,0.968,0.645,1.556,0.645c0,0,8.402,0,8.43,0c-0.238,0.357-0.403,0.756-0.403,1.195v17.847 c0,0.565,0.223,1.093,0.609,1.503c-0.2,0-8.931,0-8.931,0c-0.588,0-1.141,0.229-1.556,0.645l-1.011,1.011 c-0.416,0.415-0.646,0.968-0.646,1.556s0.229,1.141,0.645,1.557l1.013,1.012c0.415,0.416,0.968,0.645,1.555,0.645 c0,0,8.478,0,8.842,0c-0.318,0.391-0.521,0.859-0.521,1.371v19.91c0,0.471,0.183,0.896,0.453,1.27 c-0.013,0-0.023-0.006-0.036-0.006H12.05c-0.588,0-1.141,0.229-1.556,0.645l-2.023,2.023c-0.632,0.631-0.819,1.572-0.477,2.396 c0.342,0.826,1.14,1.359,2.032,1.359h12.49c0.893,0,1.69-0.533,2.032-1.359c0.114-0.273,0.169-0.561,0.169-0.844 c0-0.459-0.18-0.889-0.454-1.266c0.295,0.004,0.593-0.045,0.878-0.162c0.825-0.342,1.358-1.141,1.358-2.033V43.61 c0-0.893-0.533-1.69-1.358-2.032c-0.4-0.166-0.82-0.167-1.228-0.093C23.944,41.34,24,41.202,24,41.05 c0-0.199-0.062-0.383-0.113-0.57c0.415,0.08,0.845,0.082,1.255-0.088c0.825-0.342,1.358-1.139,1.358-2.032V16.466 c0-0.894-0.533-1.691-1.358-2.033c-0.27-0.111-0.551-0.164-0.83-0.166c0.241-0.361,0.406-0.764,0.406-1.193 c0-0.283-0.056-0.57-0.169-0.844c-0.343-0.825-1.14-1.358-2.032-1.358H10.026z M22.743,42.055L22.743,42.055L22.743,42.055z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.46" y1="4.33" x2="16.46" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.636,16.094l-4.023-4.022h17.318l-4.023,4.022H11.636z M20.907,68.007l4.023,4.023H7.612 l4.023-4.023H20.907z M11.341,43.063L9.329,41.05l2.012-2.011h9.861l2.012,2.011l-2.012,2.013H11.341z M21.276,18.075l4.023-4.024 v26.723l-4.023-4.023V18.075z M21.276,45.22l4.023-4.023v28.785l-4.023-4.023V45.22z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_three_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.32,16.029l-4.023-4.022h17.318l-4.023,4.022H12.32z M21.592,67.941l4.023,4.023H8.297l4.023-4.023 H21.592z M12.025,42.998l-2.012-2.014l2.012-2.01h9.861l2.012,2.01l-2.012,2.014H12.025z M21.961,18.011l4.023-4.024v26.723 l-4.023-4.023V18.011z M21.961,45.154l4.023-4.023v28.785l-4.023-4.023V45.154z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_two.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-0.641 0.065 34 86">
-<path fill-opacity="0.03" fill="#DEE9F3" d="M10.066,4.814c-3.329,0-6.303,1.988-7.578,5.065c-1.275,3.08-0.573,6.59,1.79,8.943 l2.016,2.015c1.546,1.548,3.604,2.401,5.796,2.401c0,0,1.079,0,2.025,0c0,1.676,0,6.988,0,8.663c-0.951,0-2.041,0-2.041,0 c-2.19,0-4.25,0.854-5.799,2.402l-1.01,1.009c0,0-0.561,0.764-0.864,1.178c-2.634,1.453-4.282,4.115-4.282,7.094V67.53 c0,1.842,0.715,3.639,1.979,5.125c0.051,0.258,0.12,0.604,0.12,0.604c0.001,0.006,0.062,0.238,0.062,0.238l0.13,0.432 c0.003,0.01,0.081,0.229,0.081,0.229c1.272,3.07,4.246,5.059,7.575,5.059h12.489c3.328,0,6.302-1.986,7.575-5.063 c1.276-3.078,0.576-6.588-1.782-8.941l-2.018-2.02c-1.551-1.549-3.611-2.402-5.799-2.402c0,0-1.054,0-1.986,0 c0-1.77,0-8.691,0-10.462c1.113,0,2.563,0,2.563,0c2.185,0,4.242-0.852,5.791-2.397l1.021-1.021 c0.539-0.54,0.988-1.267,1.388-2.158c2.043-1.573,3.234-3.846,3.234-6.328V16.397c0-1.886-0.743-3.712-2.057-5.209 c-0.039-0.197-0.081-0.41-0.081-0.41c0.003,0.014-0.059-0.233-0.059-0.233l-0.138-0.452l-0.083-0.229 c-1.271-3.063-4.243-5.049-7.569-5.049H10.066z"/>
-<path fill-opacity="0.05" fill="#DEE9F3" d="M10.066,6.015c-2.842,0-5.381,1.697-6.469,4.324c-1.09,2.629-0.49,5.626,1.527,7.635 l2.018,2.016c1.319,1.321,3.076,2.05,4.947,2.05c0,0,1.951,0,3.226,0c0,1.796,0,9.267,0,11.063c-1.278,0-3.241,0-3.241,0 c-1.87,0-3.628,0.729-4.95,2.051l-1.011,1.009c-0.311,0.312-0.59,0.713-0.865,1.192c-2.382,1.177-3.929,3.548-3.929,6.23V67.53 c0,1.705,0.688,3.32,1.901,4.621c0.066,0.332,0.174,0.871,0.174,0.871c0.008,0.039,0.021,0.09,0.033,0.127l0.13,0.432 c0.012,0.037,0.024,0.076,0.04,0.111c1.088,2.627,3.626,4.324,6.468,4.324h12.489c2.842,0,5.379-1.697,6.467-4.322 c1.089-2.629,0.492-5.625-1.521-7.633l-2.019-2.02c-1.324-1.323-3.082-2.052-4.95-2.052c0,0-1.92,0-3.187,0 c0-1.863,0-10.999,0-12.862c1.38,0,3.763,0,3.763,0c1.865,0,3.621-0.727,4.943-2.047l1.02-1.02c0.514-0.516,0.92-1.207,1.267-2.043 c1.87-1.32,3.004-3.363,3.004-5.595V16.397c0-1.746-0.716-3.388-1.978-4.697c-0.059-0.295-0.137-0.688-0.137-0.688 c-0.008-0.039-0.021-0.09-0.033-0.129l-0.135-0.441c-0.011-0.037-0.023-0.074-0.039-0.109c-1.088-2.623-3.625-4.318-6.465-4.318 H10.066z"/>
-<path fill-opacity="0.07" fill="#DEE9F3" d="M10.066,7.215c-2.355,0-4.459,1.406-5.359,3.583c-0.902,2.178-0.407,4.66,1.265,6.325 L7.99,19.14c1.094,1.096,2.55,1.699,4.1,1.699c0,0,2.94,0,4.426,0c0,1.883,0,11.581,0,13.464c-1.487,0-4.441,0-4.441,0 c-1.549,0-3.006,0.604-4.102,1.699l-1.011,1.009c-0.324,0.324-0.589,0.738-0.835,1.207c-0.009,0.004-0.018,0.005-0.025,0.008 c-2.176,0.902-3.582,3.006-3.582,5.359V67.53c0,1.545,0.674,2.994,1.818,4.086c0.041,0.209,0.233,1.172,0.233,1.172 c0-0.002,0.136,0.445,0.136,0.445c0.9,2.176,3.004,3.582,5.358,3.582h12.489c2.354,0,4.457-1.404,5.357-3.58 c0.902-2.178,0.408-4.66-1.26-6.324l-2.02-2.021c-1.098-1.096-2.554-1.699-4.102-1.699c0,0-2.907,0-4.387,0 c0-1.933,0-13.33,0-15.263c1.557,0,4.963,0,4.963,0c1.545,0,3-0.603,4.097-1.696l1.018-1.018c0.497-0.499,0.858-1.162,1.146-1.943 c1.703-1.059,2.773-2.849,2.773-4.847V16.397c0-1.582-0.701-3.056-1.893-4.153c-0.075-0.378-0.198-0.997-0.198-0.997l-0.139-0.455 c-0.9-2.172-3.003-3.577-5.356-3.577H10.066z"/>
-<path fill-opacity="0.09" fill="#DEE9F3" d="M10.066,8.415c-1.867,0-3.536,1.115-4.251,2.842c-0.716,1.727-0.322,3.697,1.003,5.016 l2.02,2.02c0.868,0.868,2.023,1.347,3.252,1.347c0,0,3.996,0,5.626,0c0,1.978,0,14.358,0,15.864c-1.683,0-5.642,0-5.642,0 c-1.229,0-2.384,0.479-3.253,1.348l-1.011,1.01c-0.377,0.376-0.645,0.854-0.865,1.387c-0.184,0.041-0.385,0.088-0.385,0.088 c-1.726,0.715-2.841,2.384-2.841,4.25V67.53c0,1.389,0.665,2.658,1.741,3.521c-0.002,0.016-0.005,0.035-0.005,0.045 c0,0.045,0.013,0.059,0.031,0.15l0.261,1.305c0.016,0.078,0.038,0.152,0.068,0.225c0.713,1.725,2.381,2.84,4.249,2.84h12.489 c1.867,0,3.535-1.115,4.249-2.84c0.716-1.727,0.323-3.695-0.999-5.016l-2.021-2.021c-0.87-0.869-2.024-1.348-3.253-1.348 c0,0-3.947,0-5.587,0c0-1.869,0-15.789,0-17.664c1.694,0,6.163,0,6.163,0c1.226,0,2.38-0.479,3.25-1.346l1.016-1.016 c0.498-0.5,0.808-1.15,1.021-1.869c1.543-0.78,2.546-2.324,2.546-4.073V16.397c0-1.416-0.688-2.702-1.798-3.564 c-0.005-0.018-0.27-1.353-0.27-1.353c-0.016-0.077-0.039-0.152-0.068-0.225c-0.716-1.726-2.385-2.841-4.25-2.841H10.066z"/>
-<path fill-opacity="0.11" fill="#DEE9F3" d="M10.066,9.615c-1.381,0-2.613,0.824-3.143,2.101s-0.238,2.732,0.741,3.707l2.021,2.02 c0.642,0.643,1.495,0.996,2.403,0.996c0,0,4.73,0,6.826,0c0,0.033,0,17.962,0,17.962c0,0.104,0.049,0.2,0.059,0.303 c-2.228,0-6.9,0-6.9,0c-0.908,0-1.762,0.354-2.404,0.996L8.658,38.71c-0.438,0.437-0.684,0.99-0.833,1.575 c-0.272,0.036-0.55,0.053-0.806,0.158c-1.275,0.529-2.1,1.763-2.1,3.142V67.53c0,1.273,0.722,2.395,1.832,2.98 c-0.029,0.168-0.088,0.334-0.088,0.502l0.261,1.305c0.527,1.273,1.761,2.098,3.141,2.098h12.489c1.379,0,2.612-0.824,3.141-2.098 c0.529-1.277,0.239-2.732-0.738-3.707l-2.021-2.023c-0.643-0.643-1.496-0.996-2.404-0.996c0,0-4.673,0-6.802,0 c0.001-0.029,0.015-0.057,0.015-0.084V45.608c0-0.027-0.014-0.054-0.014-0.081c2.201,0,7.377,0,7.377,0 c0.906,0,1.76-0.354,2.402-0.995l1.014-1.015c0.52-0.521,0.789-1.196,0.896-1.91c0.069-0.022,0.152-0.014,0.221-0.042 c1.275-0.529,2.1-1.762,2.1-3.142V16.397c0-1.279-0.729-2.408-1.848-2.99c0.018-0.13,0.063-0.26,0.063-0.39l-0.26-1.302 c-0.529-1.277-1.762-2.101-3.141-2.101H10.066z"/>
-<path fill-opacity="0.13" fill="#DEE9F3" d="M10.066,10.815c-0.894,0-1.691,0.533-2.033,1.359C7.691,13,7.879,13.942,8.512,14.573 l2.023,2.021c0.414,0.414,0.967,0.644,1.555,0.644c0,0,8.383,0,8.422,0c-0.233,0.354-0.396,0.749-0.396,1.184V36.4 c0,0.565,0.223,1.093,0.609,1.503c-0.699,0-8.651,0-8.651,0c-0.588,0-1.141,0.229-1.557,0.645l-1.012,1.011 c-0.414,0.414-0.644,0.966-0.645,1.554c0,0.136,0.054,0.262,0.078,0.394c-0.473-0.141-0.982-0.151-1.461,0.046v0.001 c-0.825,0.342-1.358,1.14-1.358,2.032V67.53c0,0.893,0.533,1.689,1.358,2.031c0.275,0.115,0.564,0.168,0.852,0.168 c-0.282,0.381-0.466,0.818-0.466,1.283c0,0.283,0.056,0.57,0.169,0.844c0.342,0.824,1.139,1.359,2.032,1.359h12.489 c0.893,0,1.69-0.533,2.032-1.359c0.343-0.826,0.154-1.768-0.478-2.398l-2.022-2.021c-0.415-0.416-0.968-0.645-1.556-0.645H12.09 c-0.004,0-0.007,0.002-0.011,0.002c0.279-0.377,0.465-0.811,0.465-1.287V45.608c0-0.475-0.185-0.906-0.461-1.281 c0.018,0,9.024,0,9.024,0c0.586,0,1.139-0.229,1.555-0.645l1.013-1.014c0.428-0.429,0.642-0.992,0.642-1.555 c0-0.174-0.059-0.343-0.1-0.514c0.324,0.019,0.65-0.014,0.965-0.145c0.825-0.342,1.358-1.139,1.358-2.032V16.397 c0-0.893-0.533-1.689-1.358-2.031c-0.268-0.111-0.547-0.163-0.824-0.166c0.236-0.359,0.398-0.758,0.398-1.183 c0-0.284-0.056-0.569-0.169-0.844c-0.343-0.825-1.14-1.358-2.032-1.358H10.066z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.33" y1="4.33" x2="16.33" y2="66.34">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.344,65.921L7.32,69.944V41.171l4.023,4.023V65.921z M11.676,16.038L7.65,12.016h17.318 l-4.023,4.022H11.676z M20.945,67.991l4.023,4.023H7.65l4.025-4.023H20.945z M11.66,43.127l-2.014-2.013l2.014-2.011h9.861 l2.01,2.011l-2.01,2.013H11.66z M21.316,18.008l4.023-4.024v26.854l-4.023-4.023V18.008z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_two_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M11.984,65.855l-4.023,4.023V41.105l4.023,4.023V65.855z M12.316,15.974l-4.025-4.022h17.318 l-4.023,4.022H12.316z M21.586,67.926l4.023,4.023H8.291l4.025-4.023H21.586z M12.301,43.063l-2.014-2.014l2.014-2.01h9.861 l2.01,2.01l-2.01,2.014H12.301z M21.957,17.943l4.023-4.024v26.854l-4.023-4.023V17.943z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_zero.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="-1 0 34 86">
-<path fill="#DEE9F3" fill-opacity="0.03" d="M9.764,4.745c-3.328,0-6.303,1.988-7.577,5.064C2.184,9.818,2.11,10.027,2.11,10.027 L1.972,10.48c0.003-0.009-0.06,0.239-0.06,0.239c0.002-0.008-0.057,0.284-0.103,0.516c-1.272,1.488-1.993,3.291-1.993,5.14v21.929 c0,0.791,0.231,1.658,0.614,2.596c-0.383,0.938-0.614,1.805-0.614,2.596v23.99c0,1.844,0.717,3.643,1.984,5.129 c0.049,0.248,0.113,0.57,0.113,0.57l0.059,0.229l0.137,0.453c0-0.003,0.084,0.229,0.084,0.229c1.27,3.063,4.242,5.049,7.569,5.049 h12.489c3.328,0,6.301-1.986,7.576-5.063c0.018-0.043,0.032-0.095,0.047-0.14l0.137-0.483c0.013-0.047,0.111-0.494,0.177-0.789 c1.297-1.496,2.028-3.313,2.028-5.187V43.495c0-0.791-0.229-1.658-0.612-2.596c0.383-0.938,0.612-1.805,0.612-2.596V16.374 c0-1.865-0.729-3.678-2.019-5.169c-0.047-0.23-0.102-0.503-0.102-0.503c0-0.006-0.059-0.235-0.059-0.235l-0.133-0.437 c0.002,0.005-0.076-0.213-0.076-0.213c-1.275-3.085-4.25-5.073-7.579-5.073L9.764,4.745L9.764,4.745z M16.018,40.806 c0.125,0,0.252,0.048,0.378,0.085c0,0.003,0.003,0.006,0.003,0.006c0,0.006-0.002,0.008-0.002,0.008 c-0.127,0.039-0.254,0.087-0.38,0.087l0,0c-0.126,0-0.252-0.048-0.378-0.085c0,0-0.002-0.005-0.002-0.008 c0,0,0.002-0.005,0.002-0.008C15.765,40.854,15.891,40.806,16.018,40.806z"/>
-<path fill="#DEE9F3" fill-opacity="0.05" d="M9.764,5.945c-2.842,0-5.381,1.697-6.469,4.323c-0.014,0.037-0.029,0.078-0.041,0.115 L3.12,10.827c-0.012,0.038-0.021,0.076-0.028,0.114c0,0-0.096,0.48-0.159,0.798c-1.222,1.304-1.915,2.924-1.915,4.635v21.929 c0,0.824,0.263,1.688,0.688,2.596c-0.425,0.908-0.688,1.771-0.688,2.596v23.989c0,1.707,0.689,3.324,1.906,4.625 c0.064,0.326,0.167,0.84,0.167,0.84c0.008,0.037,0.021,0.085,0.031,0.123l0.136,0.443c0.012,0.037,0.024,0.076,0.039,0.111 c1.088,2.623,3.626,4.318,6.466,4.318h12.489c2.842,0,5.379-1.697,6.467-4.322l0.139-0.492c0,0,0.133-0.605,0.215-0.979 c1.24-1.309,1.945-2.939,1.945-4.668v-23.99c0-0.824-0.264-1.688-0.688-2.596c0.426-0.908,0.688-1.772,0.688-2.596V16.374 c0-1.727-0.703-3.356-1.94-4.661c-0.063-0.314-0.154-0.775-0.154-0.775c-0.008-0.038-0.021-0.09-0.032-0.128l-0.132-0.43 c-0.012-0.038-0.024-0.075-0.039-0.112c-1.088-2.626-3.626-4.323-6.468-4.323H9.764z M16.018,39.885 c0.217,0.359,0.471,0.694,0.753,1.014c-0.283,0.318-0.537,0.654-0.753,1.014c-0.218-0.359-0.472-0.695-0.754-1.014 C15.546,40.58,15.8,40.245,16.018,39.885z"/>
-<path fill="#DEE9F3" fill-opacity="0.07" d="M9.764,7.145c-2.354,0-4.458,1.406-5.359,3.582l-0.137,0.449c0,0-0.16,0.809-0.219,1.1 c-1.152,1.095-1.832,2.55-1.832,4.099v21.929c0,0.869,0.312,1.737,0.789,2.596c-0.478,0.858-0.789,1.727-0.789,2.596v23.99 c0,1.545,0.677,2.998,1.824,4.09c0.05,0.254,0.227,1.139,0.227,1.139c0-0.002,0.139,0.455,0.139,0.455 c0.9,2.17,3.003,3.576,5.356,3.576h12.489c2.354,0,4.457-1.404,5.357-3.58c0.026-0.064,0.061-0.219,0.076-0.289 c0,0,0.223-1.018,0.278-1.271c1.164-1.096,1.853-2.559,1.853-4.119V43.497c0-0.869-0.312-1.737-0.787-2.596 c0.477-0.859,0.787-1.727,0.787-2.596V16.374c0-1.563-0.688-3.026-1.855-4.122c-0.063-0.309-0.217-1.08-0.217-1.08l-0.135-0.445 c-0.9-2.176-3.004-3.582-5.358-3.582H9.764z M16.192,20.768c0,2.067,0,15.512,0,15.512c0,1.549,0.604,3.006,1.699,4.102 c0,0,0.246,0.244,0.52,0.518c-0.244,0.244-0.52,0.518-0.52,0.518c-1.096,1.097-1.699,2.553-1.699,4.102c0,0,0,15.498,0,17.603 c-0.172,0-0.178,0-0.35,0c0-2.104,0-17.603,0-17.603c0-1.549-0.604-3.005-1.699-4.102c0,0-0.244-0.244-0.518-0.518 c0.244-0.244,0.518-0.518,0.518-0.518c1.096-1.097,1.699-2.553,1.699-4.102c0,0,0-13.444,0-15.512 C16.014,20.768,16.02,20.768,16.192,20.768z M4.129,71.663c0.096,0.088,0.172,0.192,0.275,0.274 C4.284,71.84,4.198,71.758,4.129,71.663z"/>
-<path fill="#DEE9F3" fill-opacity="0.09" d="M9.764,8.345c-1.867,0-3.535,1.115-4.25,2.841c-0.03,0.072-0.054,0.151-0.069,0.229 l-0.259,1.301c-0.018,0.084-0.027,0.102-0.029,0.141c-1.074,0.863-1.738,2.133-1.738,3.519v21.929c0,0.962,0.388,1.828,0.934,2.596 c-0.546,0.768-0.934,1.634-0.934,2.596v23.989c0,1.388,0.664,2.654,1.738,3.519c-0.001,0.009-0.002,0.021-0.002,0.021 c0,0.049,0.012,0.063,0.03,0.154l0.26,1.303c0.015,0.078,0.038,0.151,0.068,0.225c0.716,1.727,2.384,2.842,4.25,2.842h12.489 c1.867,0,3.535-1.115,4.248-2.84c0,0.004-0.002,0.004-0.002,0.004c0-0.072,0.332-1.531,0.332-1.531 c0.02-0.094,0.031-0.104,0.031-0.143c0,0,0-0.014-0.002-0.018c1.086-0.863,1.758-2.138,1.758-3.533v-23.99 c0-0.963-0.389-1.828-0.934-2.596c0.545-0.769,0.934-1.635,0.934-2.596V16.374c0-1.399-0.676-2.676-1.764-3.538 c-0.004-0.031-0.011-0.05-0.025-0.123l-0.26-1.305c-0.017-0.077-0.039-0.152-0.068-0.225c-0.713-1.725-2.381-2.839-4.249-2.839 L9.764,8.345L9.764,8.345z M17.393,19.568c0,2.042,0,16.712,0,16.712c0,1.229,0.479,2.383,1.348,3.252c0,0,0.768,0.768,1.365,1.367 c-0.599,0.6-1.365,1.366-1.365,1.366c-0.868,0.87-1.348,2.024-1.348,3.252c0,0,0,16.774,0,18.803c-0.986,0-1.765,0-2.75,0 c0-2.027,0-18.803,0-18.803c0-1.229-0.479-2.383-1.348-3.251c0,0-0.768-0.768-1.367-1.367c0.6-0.6,1.367-1.366,1.367-1.366 c0.869-0.87,1.348-2.024,1.348-3.253c0,0,0-14.67,0-16.712C15.627,19.568,16.409,19.568,17.393,19.568z"/>
-<path fill="#DEE9F3" fill-opacity="0.11" d="M9.764,9.545c-1.38,0-2.613,0.824-3.142,2.1L6.363,12.95 c0,0.152,0.052,0.301,0.075,0.451c-1.104,0.588-1.82,1.705-1.82,2.974v21.929c0,1.023,0.457,1.961,1.211,2.596 c-0.754,0.635-1.211,1.573-1.211,2.596v23.99c0,1.27,0.72,2.391,1.827,2.977c-0.026,0.16-0.083,0.32-0.083,0.48l0.26,1.303 c0.529,1.275,1.762,2.1,3.142,2.1h12.489c1.379,0,2.612-0.824,3.142-2.098c0-0.002,0.26-1.305,0.26-1.305 c0-0.156-0.055-0.313-0.08-0.469c1.117-0.584,1.844-1.711,1.844-2.988v-23.99c0-1.023-0.457-1.962-1.209-2.596 c0.752-0.635,1.209-1.573,1.209-2.596v-21.93c0-1.275-0.723-2.4-1.838-2.983c0.023-0.148,0.074-0.294,0.074-0.443l-0.262-1.305 c-0.527-1.273-1.761-2.098-3.141-2.098H9.764z M18.598,18.368c0,0.01-0.006,0.021-0.006,0.031V36.28 c0,0.908,0.354,1.762,0.996,2.404l2.023,2.023c0.084,0.084,0.195,0.117,0.287,0.191c-0.092,0.074-0.203,0.107-0.289,0.192 l-2.021,2.022c-0.643,0.643-0.996,1.496-0.996,2.404v19.943c0,0.02,0.01,0.039,0.012,0.059c-1.609,0-3.555,0-5.171,0 c0-0.02,0.01-0.039,0.01-0.059V45.518c0-0.908-0.354-1.762-0.996-2.404l-2.023-2.023c-0.084-0.084-0.196-0.117-0.287-0.191 c0.092-0.074,0.204-0.107,0.289-0.192l2.021-2.022c0.643-0.643,0.996-1.496,0.996-2.404V18.399c0-0.011-0.005-0.021-0.005-0.031 C15.045,18.368,16.99,18.368,18.598,18.368z"/>
-<path fill="#DEE9F3" fill-opacity="0.13" d="M9.764,10.746c-0.893,0-1.691,0.534-2.033,1.358c-0.113,0.274-0.168,0.56-0.168,0.846 c0,0.443,0.172,0.859,0.43,1.229c-0.273,0.003-0.551,0.054-0.816,0.163l0,0c-0.824,0.342-1.357,1.139-1.357,2.032v21.929 c0,0.893,0.533,1.69,1.357,2.032c0.826,0.343,1.768,0.154,2.398-0.478l2.023-2.022c0.415-0.415,0.645-0.968,0.645-1.556v-17.88 c0-0.454-0.174-0.866-0.428-1.231c0.055,0,8.389,0,8.405,0c-0.254,0.364-0.427,0.777-0.427,1.231V36.28 c0,0.588,0.229,1.141,0.645,1.556l2.022,2.023c0.632,0.632,1.573,0.818,2.397,0.478c0.826-0.343,1.358-1.141,1.358-2.033v-21.93 c0-0.894-0.534-1.69-1.358-2.032c-0.271-0.112-0.554-0.166-0.834-0.167c0.256-0.37,0.429-0.785,0.429-1.228 c0-0.283-0.056-0.57-0.169-0.844c-0.342-0.824-1.139-1.358-2.032-1.358L9.764,10.746L9.764,10.746z M22.459,41.94l-2.021,2.022 c-0.416,0.415-0.645,0.968-0.645,1.556v19.943c0,0.467,0.18,0.891,0.447,1.262c-0.004,0-0.008-0.002-0.012-0.002 c0,0-8.417,0-8.435,0c0.268-0.371,0.447-0.795,0.447-1.26V45.518c0-0.588-0.229-1.141-0.645-1.556l-2.023-2.023 c-0.632-0.632-1.572-0.818-2.398-0.478c0,0,0,0,0,0.001c-0.824,0.342-1.357,1.14-1.357,2.032v23.99 c0,0.893,0.533,1.688,1.357,2.031c0.271,0.112,0.555,0.166,0.835,0.168c-0.271,0.375-0.449,0.803-0.449,1.258 c0,0.283,0.056,0.57,0.169,0.844c0.342,0.826,1.139,1.359,2.032,1.359h12.489c0.894,0,1.69-0.533,2.032-1.359 c0.113-0.273,0.169-0.559,0.169-0.844c0-0.455-0.179-0.883-0.449-1.258c0.287,0,0.576-0.054,0.854-0.168 c0.826-0.343,1.358-1.14,1.358-2.031v-23.99c0-0.893-0.532-1.69-1.358-2.032C24.033,41.12,23.09,41.308,22.459,41.94z"/>
-<linearGradient id="_2" gradientUnits="userSpaceOnUse" x1="16.02" y1="4.26" x2="16.02" y2="66.28">
-<stop stop-color="#87A8CB" offset="0"/>
-<stop stop-color="#235487" offset="1"/>
-</linearGradient>
-<path fill="url(#_2)" d="M11.041,36.694l-4.023,4.023V13.959l4.023,4.025V36.694z M11.041,65.875l-4.023,4.023V41.08 l4.023,4.023V65.875z M11.373,15.967l-4.025-4.021h17.318l-4.023,4.021H11.373z M20.643,67.92l4.023,4.023H7.348l4.025-4.023 H20.643z M20.992,17.985l4.023-4.025v26.758l-4.023-4.023V17.985z M20.992,45.104l4.023-4.022v28.817l-4.023-4.022V45.104z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/digital/qsn_cp_clock_digital_new_zero_shape.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg width="34" height="86" viewBox="0 0 34 86">
-<rect width="34" height="86"/>
-<path fill="#FFFFFF" d="M12.041,36.694l-4.023,4.023V13.96l4.023,4.025V36.694z M12.041,65.875l-4.023,4.023V41.081l4.023,4.023 V65.875z M12.372,15.968l-4.024-4.021h17.318l-4.024,4.021H12.372z M21.642,67.92l4.024,4.023H8.348l4.024-4.023H21.642z M21.992,17.985l4.023-4.025v26.757l-4.023-4.023V17.985z M21.992,45.104l4.023-4.023v28.818l-4.023-4.023V45.104z"/>
-</svg>
\ No newline at end of file
--- a/clock/data/effects/appear.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>1.0</duration>
- <style>linear</style>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/disappear.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>1.0</duration>
- <style>linear</style>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="1.0">0.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/fade_in.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>0.7</duration>
- <style>linear</style>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="0.7">1.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/fade_out.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<layers>
- <visual>
- <param name="opacity" type="anim">
- <duration>0.7</duration>
- <style>linear</style>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="0.7">0.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/hide_widget.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<layers>
- <visual>
- <param name="rotation_angle" type="anim">
- <duration>0.5</duration>
- <keyframe at="0.0">0</keyframe>
- <keyframe at="1.0">90</keyframe>
- </param>
-
- <param name="rotation_origin_x" ref="visual.width">0.5</param>
- <param name="rotation_origin_y" ref="visual.height">0.5</param>
- <param name="rotation_axis_y">-1</param>
-
- <param name="opacity" type="anim">
- <duration>0.5</duration>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="1.0">0.5</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/show_widget.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<layers>
- <visual>
- <param name="rotation_angle" type="anim">
- <duration>0.5</duration>
- <style>cubicbezier</style>
- <keyframe at="0.0">90</keyframe>
- <keyframe at="1.0">0</keyframe>
- </param>
-
- <param name="rotation_origin_x" ref="visual.width">0.5</param>
- <param name="rotation_origin_y" ref="visual.height">0.5</param>
- <param name="rotation_axis_y">-1</param>
-
- <param name="opacity" type="anim">
- <duration>0.5</duration>
- <style>cubicbezier</style>
- <keyframe at="0.0">0.5</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/timerknob_appear.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<layers>
- <visual>
- <param name="scale_x" type="anim">
- <duration>1.0</duration>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
-
- <param name="scale_y" type="anim">
- <duration>1.0</duration>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
-
- <param name="scale_origin_x" ref="visual.width">0.5</param>
- <param name="scale_origin_y" ref="visual.height">0.5</param>
-
- <param name="opacity" type="anim">
- <duration>1.0</duration>
- <style>linear</style>
- <keyframe at="0.0">0.2</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/effects/timerknob_disappear.fxml Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<layers>
- <visual>
- <param name="scale_x" type="anim">
- <duration>1.0</duration>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="1.0">0.0</keyframe>
- </param>
-
- <param name="scale_y" type="anim">
- <duration>1.0</duration>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="1.0">0.0</keyframe>
- </param>
-
- <param name="scale_origin_x" ref="visual.width">0.5</param>
- <param name="scale_origin_y" ref="visual.height">0.5</param>
-
- <param name="opacity" type="anim">
- <duration>1.0</duration>
- <style>linear</style>
- <keyframe at="0.0">1.0</keyframe>
- <keyframe at="1.0">0.0</keyframe>
- </param>
- </visual>
-</layers>
\ No newline at end of file
--- a/clock/data/worldclock/qtg_test_day.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<g>
- <rect fill="none" width="40" height="40"/>
- <g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.2842" y1="1.167" x2="18.8078" y2="38.5324">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M20.036,11.635c-4.657,0-8.433,3.771-8.433,8.424c0,4.654,3.775,8.428,8.433,8.428
- c4.649,0,8.423-3.773,8.423-8.428C28.459,15.406,24.686,11.635,20.036,11.635z"/>
- <path d="M11.023,20.059c0-4.973,4.034-9.002,9.012-9.002l0,0v0.576v0.58c-4.338,0.008-7.85,3.514-7.854,7.846l0,0
- c0.004,4.332,3.516,7.84,7.854,7.846l0,0c4.328-0.006,7.837-3.514,7.844-7.846l0,0c-0.007-4.336-3.512-7.838-7.844-7.846l0,0
- v-0.58v-0.578c4.968,0.002,9,4.029,9.002,9.004l0,0c-0.002,4.973-4.032,9.006-9.002,9.006l0,0
- C15.058,29.064,11.023,25.033,11.023,20.059L11.023,20.059z"/>
- </g>
- <g>
- <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20.2666" y1="1.1016" x2="17.7908" y2="38.4591">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <rect x="18.335" y="1.504" fill="url(#SVGID_2_)" width="3.366" height="6.674"/>
- <path d="M18.335,8.756c-0.156,0-0.302-0.061-0.409-0.168l0,0c-0.111-0.109-0.169-0.256-0.169-0.408l0,0V1.502
- c0-0.15,0.058-0.301,0.167-0.408l0,0c0.109-0.107,0.258-0.17,0.411-0.17l0,0h3.364c0.155,0,0.303,0.061,0.41,0.17l0,0
- c0.109,0.109,0.17,0.254,0.17,0.408l0,0V8.18c0,0.152-0.061,0.299-0.17,0.406l0,0c-0.107,0.109-0.255,0.17-0.41,0.17l0,0H18.335
- L18.335,8.756z M18.912,7.6h2.209V2.082h-2.209V7.6L18.912,7.6z"/>
- </g>
- <g>
- <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="22.2773" y1="1.2441" x2="19.8019" y2="38.5949">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <rect x="18.346" y="31.828" fill="url(#SVGID_3_)" width="3.367" height="6.67"/>
- <path d="M18.345,39.076c-0.151,0-0.3-0.063-0.409-0.17l0,0c-0.107-0.107-0.17-0.256-0.17-0.408l0,0v-6.672
- c0-0.154,0.063-0.301,0.17-0.408l0,0c0.106-0.109,0.258-0.172,0.409-0.172l0,0h3.368c0.15,0,0.3,0.063,0.41,0.172l0,0
- c0.107,0.107,0.169,0.254,0.169,0.408l0,0v6.672c0,0.152-0.062,0.299-0.171,0.408l0,0c-0.11,0.111-0.254,0.17-0.408,0.17l0,0
- H18.345L18.345,39.076z M18.923,37.92h2.209v-5.514h-2.209V37.92L18.923,37.92z"/>
- </g>
- <g>
- <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="36.3447" y1="2.1719" x2="33.8695" y2="39.52">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <rect x="31.822" y="18.404" fill="url(#SVGID_4_)" width="6.668" height="3.363"/>
- <path d="M31.821,22.346c-0.155,0-0.3-0.057-0.409-0.168l0,0c-0.109-0.111-0.17-0.256-0.17-0.41l0,0v-3.363
- c0-0.152,0.061-0.301,0.17-0.408l0,0c0.106-0.109,0.256-0.17,0.409-0.17l0,0h6.669c0.154,0,0.299,0.059,0.408,0.17l0,0
- c0.109,0.109,0.169,0.254,0.169,0.408l0,0v3.363c0,0.154-0.06,0.299-0.169,0.41l0,0c-0.109,0.107-0.254,0.168-0.408,0.168l0,0
- H31.821L31.821,22.346z M32.398,21.189h5.512v-2.207h-5.512V21.189L32.398,21.189z"/>
- </g>
- <g>
- <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="6.1685" y1="0.1699" x2="3.6929" y2="37.5228">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <rect x="1.512" y="18.404" fill="url(#SVGID_5_)" width="6.672" height="3.363"/>
- <path d="M1.51,22.346c-0.154,0-0.299-0.061-0.408-0.168l0,0c-0.111-0.109-0.17-0.256-0.17-0.41l0,0v-3.365
- c0-0.152,0.062-0.301,0.17-0.408l0,0c0.107-0.107,0.258-0.168,0.408-0.168l0,0h6.674c0.152,0,0.299,0.059,0.407,0.168l0,0
- c0.111,0.111,0.169,0.254,0.169,0.408l0,0v3.365c0,0.154-0.061,0.301-0.169,0.41l0,0c-0.108,0.107-0.255,0.168-0.407,0.168l0,0
- H1.51L1.51,22.346z M2.088,21.189h5.518v-2.207H2.088V21.189L2.088,21.189z"/>
- </g>
- <g>
- <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="31.2402" y1="1.8281" x2="28.7642" y2="39.1892">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <polygon fill="url(#SVGID_6_)" points="27.195,10.461 31.912,5.746 34.295,8.127 29.578,12.846 "/>
- <path d="M29.166,13.252l-2.381-2.383l0.41-0.408l0.408,0.41l-0.408-0.41l-0.41,0.408c-0.226-0.227-0.228-0.594,0-0.816l0,0
- l4.717-4.719c0.227-0.227,0.59-0.227,0.817,0l0,0l2.384,2.385c0.109,0.107,0.169,0.252,0.169,0.408l0,0
- c0,0.152-0.06,0.299-0.169,0.408l0,0l-4.719,4.717c-0.107,0.111-0.255,0.17-0.41,0.17l0,0
- C29.422,13.422,29.275,13.363,29.166,13.252L29.166,13.252z M29.574,12.027l3.9-3.9L31.91,6.563l-3.897,3.898L29.574,12.027
- L29.574,12.027z"/>
- </g>
- <g>
- <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="11.314" y1="0.5049" x2="8.8376" y2="37.8696">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <polygon fill="url(#SVGID_7_)" points="5.76,31.914 10.48,27.197 12.859,29.578 8.138,34.295 "/>
- <path d="M7.727,34.703l-2.379-2.381l0.412-0.408l0.406,0.41l-0.406-0.41l-0.412,0.408c-0.227-0.227-0.227-0.594,0.002-0.818l0,0
- l4.721-4.717c0.226-0.227,0.59-0.227,0.817,0l0,0l2.381,2.379c0.108,0.107,0.171,0.256,0.167,0.412l0,0
- c0,0.152-0.059,0.299-0.17,0.408l0,0l-4.721,4.717c-0.107,0.109-0.253,0.17-0.409,0.17l0,0
- C7.98,34.873,7.836,34.811,7.727,34.703L7.727,34.703z M8.136,33.475l3.901-3.9l-1.561-1.561l-3.9,3.898L8.136,33.475
- L8.136,33.475z"/>
- </g>
- <g>
- <linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="32.5781" y1="1.9111" x2="30.1015" y2="39.2797">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <polygon fill="url(#SVGID_8_)" points="31.833,34.328 27.116,29.611 29.496,27.23 34.213,31.943 "/>
- <path d="M31.423,34.736l-4.717-4.715c-0.226-0.227-0.226-0.594,0-0.818l0,0l2.38-2.381c0.227-0.23,0.591-0.23,0.818-0.004l0,0
- l4.715,4.715c0.107,0.109,0.17,0.254,0.17,0.41l0,0c0,0.154-0.061,0.299-0.168,0.408l0,0l-2.379,2.383
- c-0.109,0.107-0.254,0.17-0.41,0.17l0,0C31.68,34.904,31.533,34.846,31.423,34.736L31.423,34.736z M31.832,34.328l0.407-0.414
- L31.832,34.328L31.832,34.328z M27.933,29.609l3.899,3.898l1.561-1.564l-3.898-3.896L27.933,29.609L27.933,29.609z"/>
- </g>
- <g>
- <linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="9.8267" y1="0.4082" x2="7.3505" y2="37.7703">
- <stop offset="0" style="stop-color:#FFF273"/>
- <stop offset="1" style="stop-color:#FFA202"/>
- </linearGradient>
- <polygon fill="url(#SVGID_9_)" points="10.404,12.9 5.684,8.184 8.062,5.801 12.783,10.518 "/>
- <path d="M9.996,13.309L5.273,8.592c-0.227-0.225-0.227-0.59-0.002-0.818l0,0L7.65,5.391c0.225-0.227,0.592-0.225,0.819,0l0,0
- l4.72,4.719c0.11,0.109,0.169,0.254,0.169,0.408l0,0c0.003,0.154-0.059,0.301-0.167,0.41l0,0l-2.378,2.381
- c-0.111,0.109-0.257,0.17-0.409,0.17l0,0C10.249,13.479,10.104,13.418,9.996,13.309L9.996,13.309z M10.404,12.898l0.407-0.408
- L10.404,12.898L10.404,12.898z M6.5,8.184l3.9,3.898l1.563-1.564l-3.901-3.9L6.5,8.184L6.5,8.184z"/>
- </g>
- </g>
-</g>
-</svg>
--- a/clock/data/worldclock/qtg_test_night.svg Thu Sep 02 20:25:23 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<g>
- <rect fill="none" width="40" height="40"/>
- <g>
- <g>
- <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21" y1="1.9922" x2="19.5737" y2="36.4605">
- <stop offset="0" style="stop-color:#A9E7FF"/>
- <stop offset="1" style="stop-color:#17BFFF"/>
- </linearGradient>
- <path fill="url(#SVGID_1_)" d="M31.95,32.916c-7.137,0-11.494-5.779-11.494-12.917c0-7.142,4.357-12.924,11.494-12.924
- c0.951,0,1.877,0.122,2.771,0.323c-3.27-3.337-6.39-5.417-11.427-5.417c-9.951,0-18.015,8.063-18.015,18.018
- S13.343,38.02,23.294,38.02c5.038,0,8.162-2.081,11.429-5.417C33.827,32.799,32.901,32.916,31.95,32.916z"/>
- <path d="M23.294,38.597C13.022,38.597,4.7,30.271,4.7,19.998l0,0c0-10.273,8.322-18.596,18.595-18.596l0,0
- c5.208-0.015,8.544,2.211,11.837,5.592l0,0c0.18,0.182,0.219,0.459,0.092,0.685l0,0c-0.124,0.223-0.379,0.336-0.631,0.281l0,0
- c-0.856-0.194-1.739-0.307-2.645-0.307l0,0c-6.779,0.012-10.885,5.419-10.914,12.345l0,0c0.029,6.917,4.135,12.329,10.914,12.341
- l0,0v0.576v0.579c-3.723,0.004-6.782-1.527-8.861-3.985l0,0c-2.085-2.461-3.209-5.829-3.209-9.511l0,0
- c0-3.688,1.124-7.053,3.209-9.515l0,0c2.079-2.462,5.139-3.994,8.861-3.985l0,0c0.358,0,0.712,0.016,1.061,0.047l0,0
- c-2.764-2.521-5.504-3.976-9.714-3.985l0,0C13.66,2.573,5.874,10.363,5.856,19.998l0,0c0.018,9.638,7.804,17.425,17.438,17.441
- l0,0c4.212-0.012,6.959-1.466,9.726-3.993l0,0c-0.354,0.03-0.71,0.046-1.072,0.044l0,0v-0.575v-0.576
- c0.905,0,1.788-0.113,2.652-0.304l0,0c0.248-0.055,0.502,0.063,0.627,0.289l0,0c0.123,0.222,0.088,0.499-0.092,0.681l0,0
- c-3.282,3.371-6.611,5.592-11.79,5.592l0,0C23.329,38.597,23.312,38.597,23.294,38.597L23.294,38.597z"/>
- </g>
- </g>
-</g>
-</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/data/xml/clockapplication.docml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <object name="alarmsAction" type="HbAction">
+ <icon iconName="qtg_mono_alarm" name="icon"/>
+ </object>
+ <object name="worldClockAction" type="HbAction">
+ <icon iconName="qtg_mono_world_clock" name="icon"/>
+ </object>
+ <object name="newAlarmAction" type="HbAction">
+ <icon iconName="qtg_mono_alarm_new" name="icon"/>
+ </object>
+ <widget name="view" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ </widget>
+ <widget name="viewMenu" role="HbView:menu" type="HbMenu">
+ </widget>
+ <string locid="txt_clock_main_view_title_clock" name="title" value="Clock"/>
+
+ <widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
+ <enums name="orientation" value="Horizontal"/>
+ <ref object="alarmsAction" role="HbWidget:addAction"/>
+ <ref object="worldClockAction" role="HbWidget:addAction"/>
+ <ref object="newAlarmAction" role="HbWidget:addAction"/>
+ </widget>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/data/xml/clockapplication.splashml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,6 @@
+<hbsplash version="1">
+ <docml>clockapplication.docml</docml>
+ <widget>view</widget>
+ <appuid>0x10005903</appuid>
+ <tsappname>clock</tsappname>
+</hbsplash>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clock/group/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,33 @@
+// Copyright (c) 2006-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: Build exports for clock
+//
+
+
+PRJ_EXPORTS
+
+../rom/clock.iby CORE_APP_LAYER_IBY_EXPORT_PATH(clock.iby)
+../rom/clockengines.iby CORE_APP_LAYER_IBY_EXPORT_PATH(clockengines.iby)
+../rom/clockresources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(clockresources.iby)
+
+../conf/clockapp.confml APP_LAYER_CONFML(clockapp.confml)
+../conf/CI_clockapp.confml APP_LAYER_CONFML(CI_clockapp.confml)
+../conf/clockapp_101F874D.crml APP_LAYER_CRML(clockapp_101F874D.crml)
+../conf/clockapp_101F8876.crml APP_LAYER_CRML(clockapp_101F8876.crml)
+
+// stubsis is added to provide IAD
+../stubsis/clock_stub.sis /epoc32/data/z/system/install/clock_stub.sis
+
+
+// End of File
+
--- a/clock/rom/clock.iby Thu Sep 02 20:25:23 2010 +0300
+++ b/clock/rom/clock.iby Fri Sep 17 08:29:05 2010 +0300
@@ -22,6 +22,11 @@
// Clock application executables.
S60_APP_EXE(clock)
+// Backup registration file
+data = ZPRIVATE\10005906\backup_registration.xml PRIVATE\10005906\backup_registration.xml
+data = ZPRIVATE\200159A2\backup_registration.xml PRIVATE\200159A2\backup_registration.xml
+data = ZPRIVATE\10005903\backup_registration.xml PRIVATE\10005903\backup_registration.xml
+
// Clock application registration file.
data=DATAZ_\private\10003a3f\import\apps\clock_reg.rsc \private\10003a3f\import\apps\clock_reg.rsc
@@ -44,6 +49,9 @@
// Stub sis
data=DATAZ_\system\install\clock_stub.sis \System\Install\clock_stub.sis
+data=ZRESOURCE\hb\splashml\clockapplication.splashml RESOURCE_FILES_DIR\hb\splashml\clockapplication.splashml
+data=ZRESOURCE\hb\splashml\clockapplication.docml RESOURCE_FILES_DIR\hb\splashml\clockapplication.docml
+
// 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
--- a/notes/data/xml/notesmainview.docml Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/data/xml/notesmainview.docml Fri Sep 17 08:29:05 2010 +0300
@@ -26,10 +26,10 @@
</widget>
<widget name="emptyListLabel" type="HbLabel">
<real name="z" value="1"/>
- <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
- <enums name="textWrapping" value="TextWordWrap"/>
- <sizehint height="expr(var(hb-param-text-height-primary) )" type="PREFERRED"/>
+ <string locid="txt_notes_list_no_notes_available" name="plainText" value="No notes available"/>
<enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
</widget>
<layout type="anchor">
<anchoritem dst="viewHeading" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/data/xml/notesapplication.docml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.1">
+ <object name="allNotesAction" type="HbAction">
+ <icon iconName="qtg_mono_notes_all" name="icon"/>
+ </object>
+ <object name="collectionsViewAction" type="HbAction">
+ <icon iconName="qtg_mono_notes_collections" name="icon"/>
+ </object>
+ <object name="newNoteAction" type="HbAction">
+ <icon iconName="qtg_mono_create_event" name="icon"/>
+ </object>
+ <widget name="view" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ </widget>
+ <widget name="viewMenu" role="HbView:menu" type="HbMenu">
+ </widget>
+ <string locid="txt_notes_title_notes" name="title" value="Notes"/>
+ <widget name="viewToolbar" role="HbView:toolBar" type="HbToolBar">
+ <enums name="orientation" value="Horizontal"/>
+ <ref object="allNotesAction" role="HbWidget:addAction"/>
+ <ref object="collectionsViewAction" role="HbWidget:addAction"/>
+ <ref object="newNoteAction" role="HbWidget:addAction"/>
+ </widget>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/notes/notesui/notesapplication/data/xml/notesapplication.splashml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,6 @@
+<hbsplash version="1">
+ <docml>notesapplication.docml</docml>
+ <widget>view</widget>
+ <appuid>0x20029F80</appuid>
+ <tsappname>notes</tsappname>
+</hbsplash>
--- a/notes/notesui/notesapplication/notesapplication.pro Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesapplication/notesapplication.pro Fri Sep 17 08:29:05 2010 +0300
@@ -51,6 +51,11 @@
DEPLOYMENT += notes
SKINICON = qtg_large_notes
+ BLD_INF_RULES.prj_exports += \
+ # splashml
+ "data/xml/notesapplication.docml /epoc32/data/z/resource/hb/splashml/notesapplication.docml" \
+ "data/xml/notesapplication.splashml /epoc32/data/z/resource/hb/splashml/notesapplication.splashml"
+
}
SOURCES += \
--- a/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/noteseditor/data/xml/notesnoteeditor.docml Fri Sep 17 08:29:05 2010 +0300
@@ -31,6 +31,7 @@
<widget name="editorHeading" type="HbLabel">
<enums name="alignment" value="AlignLeft|AlignLeading"/>
<sizehint height="var(hb-param-text-height-secondary)" type="PREFERRED" width="48un"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
<string locid="txt_notes_subhead_new_note" name="plainText"/>
</widget>
<widget name="favoriteIcon" type="HbLabel">
--- a/notes/notesui/noteseditor/src/notesnoteeditor.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/noteseditor/src/notesnoteeditor.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -332,7 +332,7 @@
// Add delete and cancel actions.
mDeleteNoteAction = new HbAction(
- hbTrId("txt_notes_button_dialog_delete"));
+ hbTrId("txt_common_button_delete"));
mCancelDeleteAction = new HbAction(
hbTrId("txt_common_button_cancel"));
confirmationQuery->addAction(mDeleteNoteAction);
--- a/notes/notesui/noteseditor/src/notestodoeditor.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/noteseditor/src/notestodoeditor.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -98,7 +98,7 @@
mDataForm = static_cast<HbDataForm *> (
mDocLoader->findWidget(TODO_EDITOR_DATA_FORM));
-
+ mDataForm->setItemPixmapCacheEnabled(true);
// Initialize the data form model.
initFormModel();
@@ -714,7 +714,7 @@
// Add delete and cancel actions.
mDeleteTodoAction = new HbAction(
- hbTrId("txt_notes_button_dialog_delete"));
+ hbTrId("txt_common_button_delete"));
mCancelDeleteAction = new HbAction(
hbTrId("txt_common_button_cancel"));
confirmationQuery->addAction(mDeleteTodoAction);
--- a/notes/notesui/notesviewmanager/inc/notesviewmanager.h Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviewmanager/inc/notesviewmanager.h Fri Sep 17 08:29:05 2010 +0300
@@ -58,6 +58,7 @@
void loadTodoView();
void loadFavoritesView();
void loadNoteView();
+ void updateOtherViews();
private slots:
void loadOtherViews();
@@ -78,6 +79,8 @@
HbAction *mDeleteAction;
HbAction *mCancelAction;
ulong mEntryId;
+
+ bool instanceViewCreated;
private:
Q_DISABLE_COPY(NotesViewManager)
--- a/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviewmanager/src/notesviewmanager.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -60,7 +60,13 @@
NotesViewManager::NotesViewManager(
NotesAppControllerIf &controllerIf, QObject *parent)
:QObject(parent),
- mAppControllerIf(controllerIf)
+ mAppControllerIf(controllerIf),
+ mMainView(0),
+ mCollectionView(0),
+ mTodoView(0),
+ mFavoriteView(0),
+ mNoteView(0),
+ instanceViewCreated(false)
{
OstTraceFunctionEntry0( NOTESVIEWMANAGER_NOTESVIEWMANAGER_ENTRY );
HbMainWindow *window = hbInstance->allMainWindows().first();
@@ -202,16 +208,12 @@
// Load the application xml.
docLoader->load(NOTES_MAIN_VIEW_XML, &loadSuccess);
- Q_ASSERT_X(
- loadSuccess,
- "notesviewmanager.cpp",
- "Unable to load the main view app xml");
-
+
// Find the main view.
mMainView = static_cast<NotesMainView *> (
docLoader->findWidget(NOTES_MAIN_VIEW));
- Q_ASSERT_X(
- mMainView, "notesviewmanager.cpp", "Unable to find the main view.");
+ mMainView->setParent(this);
+
// Setup the view.
mMainView->setupView(mAppControllerIf, docLoader);
// Connect to main view signal for entry deletion.
@@ -241,6 +243,8 @@
// Find the collection view.
mCollectionView = static_cast<NotesCollectionView *> (
docLoader->findWidget(NOTES_COLLECTION_VIEW));
+ mCollectionView->setParent(this);
+
// Setup the view.
mCollectionView->setupView(mAppControllerIf, docLoader);
OstTraceFunctionExit0( NOTESVIEWMANAGER_LOADNOTESCOLLECTIONVIEW_EXIT );
@@ -264,6 +268,8 @@
// Find the to-do view.
mTodoView = static_cast<NotesTodoView *> (
docLoader->findWidget(NOTES_TODO_VIEW));
+ mTodoView->setParent(this);
+
// Setup the view.
mTodoView->setupView(mAppControllerIf, docLoader);
// Connect to to-do view signal for entry deletion.
@@ -290,6 +296,7 @@
// Find the favorites view.
mFavoriteView = static_cast<NotesFavoriteView *> (
docLoader->findWidget(NOTES_FAVORITES_VIEW));
+ mFavoriteView->setParent(this);
// Setup the view.
mFavoriteView->setupView(mAppControllerIf, docLoader);
@@ -317,6 +324,8 @@
// Find the note view.
mNoteView = static_cast<NotesNoteView *> (
docLoader->findWidget(NOTES_NOTE_VIEW));
+ mNoteView->setParent(this);
+
// Setup the view.
mNoteView->setupView(mAppControllerIf, docLoader);
@@ -327,6 +336,33 @@
}
/*!
+ Update all the other views.
+ */
+void NotesViewManager::updateOtherViews()
+{
+ if (mCollectionView) {
+ // Populate collections view.
+ mCollectionView->populateListView();
+ }
+
+ if (mTodoView) {
+ // Update the title for to-do view.
+ mTodoView->updateTitle();
+ }
+
+ if (mNoteView) {
+ // Update the plain notes view.
+ mNoteView->updateNoteView();
+ }
+
+ if (mFavoriteView) {
+ // Update the favorites view.
+ mFavoriteView->updateFavoriteView();
+ }
+
+}
+
+/*!
Loads other views from the docml file.
*/
void NotesViewManager::loadOtherViews()
@@ -343,6 +379,10 @@
// Load the recent notes view.
loadNoteView();
+ if (instanceViewCreated) {
+ // update other views.
+ updateOtherViews();
+ }
// Disconnect the signal viewReady as all the views are loaded.
HbMainWindow *window = hbInstance->allMainWindows().first();
disconnect(
@@ -383,7 +423,7 @@
defaultActions.clear();
// Add delete and cancel actions
- mDeleteAction = new HbAction(hbTrId("txt_notes_button_dialog_delete"));
+ mDeleteAction = new HbAction(hbTrId("txt_common_button_delete"));
mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"));
confirmationQuery->addAction(mDeleteAction);
@@ -413,22 +453,17 @@
{
OstTraceFunctionEntry0( NOTESVIEWMANAGER_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY );
Q_UNUSED(status)
-
- // Update the title for main view.
- mMainView->updateTitle();
-
- // Populate collections view.
- mCollectionView->populateListView();
+
+ instanceViewCreated = true;
+
+ if (mMainView) {
+ // Update the title for main view.
+ mMainView->updateTitle();
+ }
- // Update the title for to-do view.
- mTodoView->updateTitle();
-
- // Update the plain notes view.
- mNoteView->updateNoteView();
-
- // Update the favorites view.
- mFavoriteView->updateFavoriteView();
-
+ // update other views.
+ updateOtherViews();
+
// Need to emit this signal after the view is fully constructed & populated
// with actual data and ready to be used. So entry view & instance view
// needs to be created so that a new entry can also be created. Finally
--- a/notes/notesui/notesviews/src/notescollectionview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviews/src/notescollectionview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -30,6 +30,7 @@
#include <HbAbstractViewItem>
#include <HbGroupBox>
#include <HbStyleLoader>
+#include <HbParameterLengthLimiter>
// User includes
#include <agendautil.h>
@@ -123,6 +124,7 @@
// Get the list view from the document and update the model.
mListView = static_cast<HbListView *> (
mDocLoader->findWidget("listView"));
+ mListView->setItemPixmapCacheEnabled(true);
connect(
mListView, SIGNAL(activated(const QModelIndex &)),
this, SLOT(handleActivated(const QModelIndex &)));
@@ -174,13 +176,14 @@
QStandardItemModel *model = new QStandardItemModel(this);
model->setColumnCount(1);
- QString countString(hbTrId("txt_notes_list_note_count"));
-
// Add To-do's item.
QStandardItem *item = new QStandardItem();
QStringList todoStringList;
todoStringList.append(hbTrId("txt_notes_list_todos"));
- todoStringList.append(countString.arg(QString::number(todosCount())));
+ todoStringList.append(
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(QString::number(
+ todosCount())));
item->setData(todoStringList, Qt::DisplayRole);
model->appendRow(item);
@@ -188,7 +191,10 @@
item = new QStandardItem();
QStringList favStringList;
favStringList.append(hbTrId("txt_notes_list_favorites"));
- favStringList.append(countString.arg(mFavouriteModel->rowCount()));
+ favStringList.append(
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(QString::number(
+ mFavouriteModel->rowCount())));
item->setData(favStringList, Qt::DisplayRole);
model->appendRow(item);
@@ -197,7 +203,9 @@
QStringList notesStringList;
notesStringList.append(hbTrId("txt_notes_list_plain_notes"));
notesStringList.append(
- countString.arg(QString::number(recentNotesCount())));
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(QString::number(
+ recentNotesCount())));
item->setData(notesStringList, Qt::DisplayRole);
model->appendRow(item);
@@ -224,13 +232,15 @@
void NotesCollectionView::resetCollectionView()
{
OstTraceFunctionEntry0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_ENTRY );
- QString countString(hbTrId("txt_notes_list_note_count"));
// Update the count of to-do's.
QModelIndex mdlIndex = mListView->model()->index(0, 0);
QStringList todoStringList;
todoStringList.append(hbTrId("txt_notes_list_todos"));
- todoStringList.append(countString.arg(QString::number(todosCount())));
+ todoStringList.append(
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(QString::number(
+ todosCount())));
mListView->model()->setData(mdlIndex, todoStringList, Qt::DisplayRole);
// Update the count of notes in the view.
@@ -238,7 +248,9 @@
QStringList notesStringList;
notesStringList.append(hbTrId("txt_notes_list_plain_notes"));
notesStringList.append(
- countString.arg(QString::number(recentNotesCount())));
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(QString::number(
+ recentNotesCount())));
mListView->model()->setData(mdlIndex, notesStringList, Qt::DisplayRole);
OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_RESETCOLLECTIONVIEW_EXIT );
}
@@ -369,11 +381,13 @@
if( mListView->model())
{
// Update the count of notes in the view.
- QString countString(hbTrId("txt_notes_list_note_count"));
QModelIndex mdlIndex = mListView->model()->index(1, 0);
QStringList favStringList;
favStringList.append(hbTrId("txt_notes_list_favorites"));
- favStringList.append(countString.arg(mFavouriteModel->rowCount()));
+ favStringList.append(
+ HbParameterLengthLimiter(
+ hbTrId("txt_notes_list_note_count")).arg(
+ QString::number(mFavouriteModel->rowCount())));
mListView->model()->setData(mdlIndex, favStringList, Qt::DisplayRole);
}
OstTraceFunctionExit0( NOTESCOLLECTIONVIEW_UPDATEFAVOURITESCOUNT_EXIT );
--- a/notes/notesui/notesviews/src/notesfavoriteview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviews/src/notesfavoriteview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -118,6 +118,7 @@
(mDocLoader->findWidget("favoritesListView"));
// Update the list view model.
mListView->setModel(subModel);
+ mListView->setItemPixmapCacheEnabled(true);
// Setup the operations that can be done with a list view.
connect(
mListView, SIGNAL(released(const QModelIndex &)),
--- a/notes/notesui/notesviews/src/notesmainview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviews/src/notesmainview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -116,6 +116,7 @@
// Get the list object from the document and update the model.
mListView = static_cast<HbListView *> (mDocLoader->findWidget("listView"));
+ mListView->setItemPixmapCacheEnabled(true);
Q_ASSERT_X(
mListView,
"notesmainview.cpp",
@@ -496,7 +497,9 @@
void NotesMainView::scrollTo(QModelIndex index)
{
OstTraceFunctionEntry0( NOTESMAINVIEW_SCROLLTO_ENTRY );
- mListView->scrollTo(index, HbAbstractItemView::EnsureVisible);
+ QModelIndex modelIndex = mListView->model()->index(
+ index.row(), index.column());
+ mListView->scrollTo(modelIndex, HbAbstractItemView::EnsureVisible);
OstTraceFunctionExit0( NOTESMAINVIEW_SCROLLTO_EXIT );
}
--- a/notes/notesui/notesviews/src/notesnoteview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviews/src/notesnoteview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -115,6 +115,7 @@
// Update the list view model.
mListView->setModel(subModel);
+ mListView->setItemPixmapCacheEnabled(true);
// Setup the operations that can be done with a list view.
connect(
mListView, SIGNAL(released(const QModelIndex &)),
--- a/notes/notesui/notesviews/src/notestodoview.cpp Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/notesui/notesviews/src/notestodoview.cpp Fri Sep 17 08:29:05 2010 +0300
@@ -116,6 +116,7 @@
(mDocLoader->findWidget("todoListView"));
// Update the list view model.
mListView->setModel(subModel);
+ mListView->setItemPixmapCacheEnabled(true);
// Setup the operations that can be done with a list view.
connect(
mListView, SIGNAL(activated(const QModelIndex &)),
--- a/notes/rom/notes.iby Thu Sep 02 20:25:23 2010 +0300
+++ b/notes/rom/notes.iby Fri Sep 17 08:29:05 2010 +0300
@@ -27,6 +27,10 @@
// Stub sis
data=DATAZ_\system\install\notes_stub.sis \System\Install\notes_stub.sis
+// Splashml
+data=ZRESOURCE\hb\splashml\notesapplication.splashml RESOURCE_FILES_DIR\hb\splashml\notesapplication.splashml
+data=ZRESOURCE\hb\splashml\notesapplication.docml RESOURCE_FILES_DIR\hb\splashml\notesapplication.docml
+
file=ABI_DIR\BUILD_DIR\notesmodel.dll SHARED_LIB_DIR\notesmodel.dll
file=ABI_DIR\BUILD_DIR\noteseditor.dll SHARED_LIB_DIR\noteseditor.dll
file=ABI_DIR\BUILD_DIR\notesviews.dll SHARED_LIB_DIR\notesviews.dll
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/agenda_interface_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: File that exports the files belonging to
+: agenda interface API
+*
+*/
+
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/agendaentry.h APP_LAYER_PLATFORM_EXPORT_PATH(agendaentry.h)
+inc/AgendaEntry APP_LAYER_PLATFORM_EXPORT_PATH(AgendaEntry)
+inc/agendautil.h APP_LAYER_PLATFORM_EXPORT_PATH(agendautil.h)
+inc/AgendaUtil APP_LAYER_PLATFORM_EXPORT_PATH(AgendaUtil)
+inc/agendainterfacedefines.h APP_LAYER_PLATFORM_EXPORT_PATH(agendainterfacedefines.h)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_editor_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Project specification file for calendar_editor_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/caleneditor.h APP_LAYER_PLATFORM_EXPORT_PATH(caleneditor.h)
+inc/CalenEditor APP_LAYER_PLATFORM_EXPORT_PATH(CalenEditor)
--- a/organizer_plat/calendar_exporter_api/group/bld.inf Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_plat/calendar_exporter_api/group/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -26,3 +26,4 @@
PRJ_EXPORTS
../inc/CalenExporter.h APP_LAYER_PLATFORM_EXPORT_PATH(CalenExporter.h)
+../inc/CalenExporter APP_LAYER_PLATFORM_EXPORT_PATH(CalenExporter)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_exporter_api/tsrc/bwins/calenexportertestu.def Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * LibEntryL(class CTestModuleIf &)
+
--- a/organizer_plat/calendar_exporter_api/tsrc/conf/calenexportertest.cfg Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_plat/calendar_exporter_api/tsrc/conf/calenexportertest.cfg Fri Sep 17 08:29:05 2010 +0300
@@ -1,14 +1,14 @@
#1
[Test]
title CalenExporter: Test Exporting VCal.
-create testcalenexporter testObject
+create CCalenExporterTest testObject
testObject TestExporterVCal
delete testObject
[Endtest]
#2
[Test]
title CalenExporter: Test Exporting ICal.
-create testcalenexporter testObject
+create CCalenExporterTest testObject
testObject TestExporterICal
delete testObject
[Endtest]
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_exporter_api/tsrc/eabi/calenexportertestu.def Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ _Z9LibEntryLR13CTestModuleIf @ 1 NONAME
+
--- a/organizer_plat/calendar_exporter_api/tsrc/group/calenexporter.pkg Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_plat/calendar_exporter_api/tsrc/group/calenexporter.pkg Fri Sep 17 08:29:05 2010 +0300
@@ -34,7 +34,7 @@
;
; calenexporter data input files
-"\epoc32\release\armv5\urel\calenexportertest.dll"-"$:\sys\bin\testcalenexportertest.dll"
+"\epoc32\release\armv5\urel\calenexportertest.dll"-"$:\sys\bin\calenexportertest.dll"
"/epoc32/winscw/C/testframework/calenexportertest.cfg" - "c:/testframework/calenexportertest.cfg"
;"/epoc32/winscw/C/testframework/TestFramework.ini" - "c:/testframework/TestFramework.ini"
--- a/organizer_plat/calendar_exporter_api/tsrc/group/calenexportertest.mmp Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_plat/calendar_exporter_api/tsrc/group/calenexportertest.mmp Fri Sep 17 08:29:05 2010 +0300
@@ -17,7 +17,7 @@
#include <platform_paths.hrh>
-TARGET testcalenexporter.dll
+TARGET calenexportertest.dll
TARGETTYPE dll
UID 0x1000af5a 0x01700000
@@ -25,7 +25,7 @@
VENDORID VID_DEFAULT
//TARGETPATH ?target_path
-DEFFILE testcalenexporter.def
+DEFFILE calenexportertest.def
SOURCEPATH ../src
SOURCE calenexportertest.cpp
--- a/organizer_plat/calendar_importer_api/group/bld.inf Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_plat/calendar_importer_api/group/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -26,3 +26,4 @@
PRJ_EXPORTS
../inc/CalenImporter.h APP_LAYER_PLATFORM_EXPORT_PATH(CalenImporter.h)
+../inc/CalenImporter APP_LAYER_PLATFORM_EXPORT_PATH(CalenImporter)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_launcher_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* 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: File that exports the files belonging to
+: Calendar Launcher API
+*
+*/
+
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/calenlauncher.h APP_LAYER_PLATFORM_EXPORT_PATH(calenlauncher.h)
+inc/CalenLauncher APP_LAYER_PLATFORM_EXPORT_PATH(CalenLauncher)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/calendar_settings_keys_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Project specification file for clock_settings_keys_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/calendardomaincrkeys.h APP_LAYER_PLATFORM_EXPORT_PATH(calendardomaincrkeys.h)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/clock_settings_keys_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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: Project specification file for clock_settings_keys_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/clockdomaincrkeys.h APP_LAYER_PLATFORM_EXPORT_PATH(clockdomaincrkeys.h)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/clock_settingsview_plugin_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2005-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: Project specification file for clock_settingsview_plugin_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/clocksettingsviewinterface.h APP_LAYER_PLATFORM_EXPORT_PATH(clocksettingsviewinterface.h)
+inc/ClockSettingsViewInterface APP_LAYER_PLATFORM_EXPORT_PATH(ClockSettingsViewInterface)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/eventviewer_plugin_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2005-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: Project specification file for eventviewer_plugin_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/eventviewerplugininterface.h APP_LAYER_PLATFORM_EXPORT_PATH(eventviewerplugininterface.h)
+inc/EventViewerPluginInterface APP_LAYER_PLATFORM_EXPORT_PATH(EventViewerPluginInterface)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/organizer_plat/notes_editor_api/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2005-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: Project specification file for notes_editor_api
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+inc/noteseditorinterface.h APP_LAYER_PLATFORM_EXPORT_PATH(noteseditorinterface.h)
+inc/NotesEditorInterface APP_LAYER_PLATFORM_EXPORT_PATH(NotesEditorInterface)
--- a/organizer_pub/calendar_interim_utils2_api/group/bld.inf Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_pub/calendar_interim_utils2_api/group/bld.inf Fri Sep 17 08:29:05 2010 +0300
@@ -26,3 +26,4 @@
PRJ_EXPORTS
../inc/CalenInterimUtils2.h APP_LAYER_PUBLIC_EXPORT_PATH(CalenInterimUtils2.h)
+../inc/CalenInterimUtils2 APP_LAYER_PUBLIC_EXPORT_PATH(CalenInterimUtils2)
--- a/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Thu Sep 02 20:25:23 2010 +0300
+++ b/organizer_pub/calendar_interim_utils2_api/tsrc/stiff/group/CalenInterimUtils2Test.pkg Fri Sep 17 08:29:05 2010 +0300
@@ -46,7 +46,7 @@
; None
; Install files
-"/epoc32/release/armv5/udeb/CalendarCommonUtilsTest.dll" - "!:/Sys/Bin/CalendarCommonUtilsTest.dll"
+"/epoc32/release/armv5/udeb/caleninterimutils2test.dll" - "!:/Sys/Bin/caleninterimutils2test.dll"
"/epoc32/winscw/C/testframework/caleninterimutils2test.cfg" - "c:/testframework/caleninterimutils2test.cfg"
;"/epoc32/winscw/C/testframework/TestFramework.ini" - "c:/testframework/TestFramework.ini"
--- a/package_definition.xml Thu Sep 02 20:25:23 2010 +0300
+++ b/package_definition.xml Fri Sep 17 08:29:05 2010 +0300
@@ -1,200 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
- <collection id="alarmui" name="Alarm UI" level="app">
- <component id="alarmui_build" filter="s60" name="Alarm UI Build">
- <unit bldFile="alarmui/group"/>
- </component>
- </collection>
- <collection id="calendarui" name="Calendar UI" level="ui">
- <component id="calendarui_help" filter="s60" name="Calendar UI Help">
- <unit bldFile="calendarui/help/group"/>
- </component>
- <component id="commonutils" filter="s60" name="Calendar Common Utils">
- <unit bldFile="calendarui/commonutils/group"/>
- </component>
- <component id="globaldata" filter="s60" name="Calendar Global Data">
- <unit bldFile="calendarui/globaldata/group"/>
- </component>
- <component id="settings" filter="s60" name="Calendar Settings">
- <!-- these should be merged into a single bld.inf or split into two components -->
- <unit bldFile="calendarui/settings/gsplugin/group"/>
- <unit bldFile="calendarui/settings/settingsui/group"/>
- </component>
- <component id="customisation" filter="s60" name="Calendar Customisation">
- <unit bldFile="calendarui/customisation/group"/>
- </component>
- <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
- <unit bldFile="calendarui/customisationmanager/group"/>
- </component>
- <component id="views" filter="s60" name="Calendar Views">
- <unit bldFile="calendarui/views/group"/>
- </component>
- <component id="calendarui_controller" filter="s60" name="Calendar Controller">
- <unit bldFile="calendarui/controller/group"/>
- </component>
- <component id="editors" filter="s60" name="Calendar Editors">
- <unit bldFile="calendarui/editors/group"/>
- </component>
- <component id="application" filter="s60" name="Calendar Application">
- <unit bldFile="calendarui/application/group"/>
- </component>
- <component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
- <unit bldFile="calendarui/missedalarmindicatorplugin/group"/>
- </component>
- <component id="calendarui_server" filter="s60" name="Calendar Server">
- <!-- these should be merged into a single bld.inf or split into two components -->
- <unit bldFile="calendarui/server/calensvr/group"/>
- <unit bldFile="calendarui/server/calensvrclient/group"/>
- </component>
- <component id="regionalplugins" filter="s60" name="Calendar Regional Plugins" class="plugin">
- <!-- these should be merged into a single bld.inf or split into four components -->
- <unit bldFile="calendarui/regionalplugins/calenregionalutil/group"/>
- <unit bldFile="calendarui/regionalplugins/lunarchinese/group"/>
- <unit bldFile="calendarui/regionalplugins/lunarvietnamese/group"/>
- <unit bldFile="calendarui/regionalplugins/thai/group"/>
- </component>
- <component id="calendarui_build" filter="s60" name="Calendar UI Build">
- <unit bldFile="calendarui/group"/>
- </component>
- </collection>
- <collection id="clock2" name="Clock" level="app">
- <component id="clockengines" filter="s60" name="Clock Engines">
- <unit bldFile="clock2/clockengines/group"/>
- </component>
- <component id="clockui" filter="s60" name="Clock UI">
- <unit bldFile="clock2/clockui/group"/>
- <!-- <unit bldFile="clock2/clockui/plugins/datetimeviewplugin/group"/> -->
- </component>
- <component id="clock2_help" filter="s60" name="Clock Help">
- <unit bldFile="clock2/help/group"/>
- </component>
- <component id="clock2_build" filter="s60" name="Clock Build">
- <unit bldFile="clock2/group"/>
- </component>
- </collection>
- <collection id="meetingui" name="Meeting UI" level="ui">
- <component id="attendeeview" filter="s60" name="Attendee View">
- <unit bldFile="meetingui/attendeeview/group"/>
- </component>
- <component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
- <unit bldFile="meetingui/agnentryui/group"/>
- </component>
- <component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
- <unit bldFile="meetingui/meetingrequestutils/group"/>
- </component>
- <component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
- <unit bldFile="meetingui/meetingrequestviewers/group"/>
- </component>
- <component id="meetingui_build" filter="s60" name="Meeting UI Build">
- <unit bldFile="meetingui/group"/>
- </component>
- </collection>
- <collection id="notepad" name="Notepad" level="ui">
- <component id="notepad_help" filter="s60" name="Notepad Help">
- <unit bldFile="notepad/help/group"/>
- </component>
- <component id="notepad1" filter="s60" name="Notepad Application 1">
- <unit bldFile="notepad/notepad1/group"/>
- <!-- <unit bldFile="notepad/notepad1/syncmladapter/group"/> -->
- </component>
- <component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
- <unit bldFile="notepad/txtrecog/group"/>
- </component>
- <component id="notepad_build" filter="s60" name="Notepad Build">
- <unit bldFile="notepad/group"/>
- </component>
- </collection>
- <collection id="searchui" name="Search UI" level="app">
- <component id="searchui_help" filter="s60" name="Search UI Help">
- <unit bldFile="searchui/help/group"/>
- </component>
- <component id="searchapp" filter="s60" name="Search Application">
- <unit bldFile="searchui/searchapp/group"/>
- <!-- <unit bldFile="searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
- <!-- <unit bldFile="searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
- </component>
- <component id="searchui_build" filter="s60" name="Search UI Build">
- <unit bldFile="searchui/group"/>
- </component>
- </collection>
- <collection id="calendarengines" name="Calendar Engines" level="engine">
- <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
- <unit bldFile="calendarengines/versit2/group"/>
- </component>
- <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
- <unit bldFile="calendarengines/agnversit2/group"/>
- </component>
- <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
- <unit bldFile="calendarengines/caleninterimutils/group"/>
- </component>
- <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
- <unit bldFile="calendarengines/calenimp/group"/>
- </component>
- <component id="calenlauncher" filter="s60" name="Calendar Launcher">
- <unit bldFile="calendarengines/calenlauncher/group"/>
- </component>
- <component id="calendarengines_build" filter="s60" name="Calendar Engines Build">
- <unit bldFile="calendarengines/group"/>
- </component>
- </collection>
- <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
- <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
- <unit bldFile="meetingrequestengines/mrmailbox/group"/>
- </component>
- <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
- <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
- </component>
- </collection>
- <collection id="alarmengines" name="Alarm Engines" level="engine">
- <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
- <unit bldFile="alarmengines/missedalarmstore/group"/>
- </component>
- </collection>
- <collection id="searchfw" name="Search Framework" level="services">
- <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
- <unit bldFile="searchfw/coresearchfw/group"/>
- </component>
- <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
- <unit bldFile="searchfw/plugins/group"/>
- </component>
- </collection>
- <collection id="pimappservices" name="PIM Application Services" level="services">
- <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
- <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
- </component>
- <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
- <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
- </component>
- <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
- <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
- </component>
- </collection>
- <collection id="pimappsupport" name="PIM Application Support" level="support">
- <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
- <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
- </component>
- <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
- <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
- </component>
- </collection>
- <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
- <component id="organizer_pub" filter="s60" name="Organizer Application Suite Public Interfaces" class="api">
- <unit bldFile="organizer_pub/group"/>
- <!-- <unit bldFile="organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_pub/notepad_library_api/tsrc/group"/> -->
- </component>
- <component id="organizer_plat" filter="s60" name="Organizer Application Suite Platform Interfaces" class="api">
- <unit bldFile="organizer_plat/group"/>
- <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/calendar_exporter_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/calendar_importer_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
- <!-- <unit bldFile="organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
- </component>
- <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
- </component>
- </collection>
- </package>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
+ <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+ <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+ <meta rel="Api" href="organizer_pub/calendar_interim_utils2_api/calendar_interim_utils2_api.metaxml"/>
+ <unit bldFile="organizer_pub/calendar_interim_utils2_api/group"/>
+ </component>
+ </collection>
+ <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+ <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+ <meta rel="Api" href="organizer_plat/agenda_versit_2_api/agenda_versit_2_api.metaxml"/>
+ <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>
+ </component>
+ <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+ <meta rel="Api" href="organizer_plat/calendar_exporter_api/calendar_exporter_api.metaxml"/>
+ <unit bldFile="organizer_plat/calendar_exporter_api/group"/>
+ </component>
+ <component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+ <meta rel="Api" href="organizer_plat/calendar_importer_api/calendar_importer_api.metaxml"/>
+ <unit bldFile="organizer_plat/calendar_importer_api/group"/>
+ </component>
+ <component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+ <unit bldFile="organizer_plat/calendar_launcher_api"/>
+ </component>
+ <component id="agenda_interface_api" name="Agenda Interface API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/agenda_interface_api"/>
+ </component>
+ <component id="calendar_editor_api" name="Calendar Editor API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/calendar_editor_api"/>
+ </component>
+ <component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/notes_editor_api"/>
+ </component>
+ <component id="clock_settingsview_plugin_api" name="Clock Settings View Plugin API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/clock_settingsview_plugin_api"/>
+ </component>
+ <component id="clock_settings_keys_api" name="Clock Settings Keys API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/clock_settings_keys_api"/>
+ </component>
+ <component id="calendar_settings_keys_api" name="Calendar Settings Keys API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/calendar_settings_keys_api"/>
+ </component>
+ <component id="eventviewer_plugin_api" name="Event Viewer Plugin API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="organizer_plat/eventviewer_plugin_api"/>
+ </component>
+ </collection>
+ <collection id="agendainterface" name="Agenda Interface" level="services">
+ <!-- collection is really a component, should move down a directory -->
+ <component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
+ <unit bldFile="agendainterface" qt:proFile="agendainterface.pro"/>
+ </component>
+ </collection>
+ <collection id="calendarui" name="Calendar UI" level="ui">
+ <component id="commonutils" filter="s60" name="Calendar Common Utils">
+ <unit bldFile="calendarui/commonutils" qt:proFile="commonutils.pro"/>
+ </component>
+ <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+ <unit bldFile="calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+ </component>
+ <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
+ <unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+ </component>
+ <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
+ <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+ </component>
+ <component id="globaldata" filter="s60" name="Calendar Global Data">
+ <unit bldFile="calendarui/globaldata" qt:proFile="globaldata.pro"/>
+ </component>
+ <component id="settings" filter="s60" name="Calendar Settings">
+ <unit bldFile="calendarui/settings" qt:proFile="settings.pro"/>
+ </component>
+ <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
+ <unit bldFile="calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+ </component>
+ <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+ <unit bldFile="calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+ </component>
+ <component id="calendarui_views" filter="s60" name="Calendar Views">
+ <unit bldFile="calendarui/views" qt:proFile="views.pro"/>
+ </component>
+ <component id="calendarui_controller" filter="s60" name="Calendar Controller">
+ <unit bldFile="calendarui/controller" qt:proFile="controller.pro"/>
+ </component>
+ <component id="calendarui_application" filter="s60" name="Calendar Application">
+ <unit bldFile="calendarui/application" qt:proFile="application.pro"/>
+ </component>
+ <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+ </component>
+ <component id="calenviewerservice" name="Calendar Viewer Service" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="calendarui/calenviewerservice" qt:proFile="calenviewerservice.pro"/>
+ </component>
+ <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+ <meta rel="config">
+ <defined condition="FF_CALDAV_SUPPORT"/>
+ </meta>
+ <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
+ </component>
+ </collection>
+ <collection id="notes" name="Notes" level="ui">
+ <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
+ <unit bldFile="notes" qt:proFile="notes.pro"/>
+ </component>
+ </collection>
+<collection id="calendarengines" name="Calendar Engines" level="engine">
+ <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+ <unit bldFile="calendarengines/versit2/group"/>
+ </component>
+ <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+ <unit bldFile="calendarengines/agnversit2/group"/>
+ </component>
+ <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+ <unit bldFile="calendarengines/caleninterimutils/group"/>
+ </component>
+ <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+ <unit bldFile="calendarengines/calenimp/group"/>
+ </component>
+ <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+ <meta rel="config">
+ <defined condition="FF_CALDAV_SUPPORT"/>
+ </meta>
+ <!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
+ </component>
+ </collection>
+ <collection id="clock" name="Clock" level="app">
+ <component id="clockengines" filter="s60" name="Clock Engines">
+ <unit bldFile="clock/clockengines" qt:proFile="clockengines.pro"/>
+ </component>
+ <component id="clockmw" filter="s60" name="Clock Middleware" introduced="^4">
+ <unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>
+ </component>
+ <component id="clockui" filter="s60" name="Clock UI">
+ <unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>
+ </component>
+ <component id="clock_config" filter="s60" name="Clock Config" class="config">
+ <unit bldFile="clock/group"/>
+ </component>
+ </collection>
+ <collection id="pimappservices" name="PIM Application Services" level="services">
+ <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+ <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
+ </component>
+ <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+ <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+ </component>
+ <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+ <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+ </component>
+ </collection>
+ <collection id="pimappsupport" name="PIM Application Support" level="support">
+ <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+ <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+ </component>
+ <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+ <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+ </component>
+ <component id="chinesecalendaralg" name="Chinese Calendar Algorithm" introduced="^2" purpose="optional" class="plugin">
+ <unit bldFile="pimappsupport/chinesecalendaralg/group" mrp="pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/>
+ </component>
+ </collection>
+ <collection id="alarmui" name="Alarm UI" level="app">
+ <!-- collection is really a component, should move down a directory -->
+ <component id="alarmui_build" filter="s60" name="Alarm UI Build">
+ <unit bldFile="alarmui" qt:proFile="alarmui.pro"/>
+ </component>
+ </collection>
+ <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+ <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+ <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 17 08:29:05 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>
