git.iko.soy/unity8
on xenial help sign in
Fixed time conversion
commitbbd9eee93dcc4ad2667b1750adca81bdaf1013f8 authorNick Dedekind <nick.dedekind@canonical.com> dateMon 20 Jul 2015, 15:53 (11 years ago) parentd035bae
2 files changed+6−6
compare with xenial
unifiedsplit
qml/Panel/Indicators/MenuItemFactory.qml+4−4 qml/Panel/Indicators/MessageMenuItemFactory.qml+2−2
qml/Panel/Indicators/MenuItemFactory.qml+4−4
@@ -353,11 +353,11 @@ Item {
353353 property int menuIndex: -1
354354 property var extendedData: menuData && menuData.ext || undefined
355355
356− property string serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000)
356+ property string serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
357357 LiveTimer {
358358 frequency: LiveTimer.Relative
359359 relativeTime: alarmItem.serverTime
360− onTrigger: alarmItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000)
360+ onTrigger: alarmItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
361361 }
362362
363363 text: menuData && menuData.label || ""
@@ -394,11 +394,11 @@ Item {
394394 property int menuIndex: -1
395395 property var extendedData: menuData && menuData.ext || undefined
396396
397− property string serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000)
397+ property string serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
398398 LiveTimer {
399399 frequency: LiveTimer.Relative
400400 relativeTime: appointmentItem.serverTime
401− onTrigger: appointmentItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000)
401+ onTrigger: appointmentItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
402402 }
403403
404404 text: menuData && menuData.label || ""
qml/Panel/Indicators/MessageMenuItemFactory.qml+2−2
@@ -39,12 +39,12 @@ Loader {
3939 id: priv
4040 property var extendedData: menuData && menuData.ext || undefined
4141 property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
42− property string time: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000000)
42+ property string time: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) / 1000)
4343 }
4444 LiveTimer {
4545 frequency: LiveTimer.Relative
4646 relativeTime: priv.time
47− onTrigger: priv.time = new Date(getExtendedProperty(priv.extendedData, "xCanonicalTime", 0) / 1000000)
47+ onTrigger: priv.time = new Date(getExtendedProperty(priv.extendedData, "xCanonicalTime", 0) / 1000)
4848 }
4949
5050 onMenuModelChanged: {