on xenial help sign in
no need for a local instance of TimeFormatter
commit7f93f50d170a3ccf0df43c49d350d3dc4959d41a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 16 Sep 2015, 13:58 (11 years ago) parentd732c85
1 file changed+7−2
qml/Panel/Indicators/MenuItemFactory.qml+7−2
qml/Panel/Indicators/MenuItemFactory.qml+7−2
@@ -79,6 +79,11 @@ Item {
7979 return defaultValue;
8080 }
8181
82+ Utils.TimeFormatter
83+ {
84+ id: tzFormatter
85+ }
86+
8287 Component {
8388 id: separatorMenu;
8489
@@ -457,6 +462,7 @@ Item {
457462 Menus.CalendarMenu {
458463 objectName: "calendarMenu"
459464 highlightWhenPressed: false
465+ focus: true
460466 }
461467 }
462468
@@ -472,11 +478,10 @@ Item {
472478 property int menuIndex: -1
473479 property var extendedData: menuData && menuData.ext || undefined
474480 readonly property var tz: getExtendedProperty(extendedData, "xCanonicalTimezone", "UTC")
475− property var tzFormatter: Utils.TimeFormatter {}
476481 property var updateTimer: Timer {
477482 repeat: true
478483 running: identifier == "indicator-datetime" // only run when we're open
479− onTriggered: tzMenuItem.time = tzMenuItem.tzFormatter.currentTimeInTimezone(tzMenuItem.tz)
484+ onTriggered: tzMenuItem.time = tzFormatter.currentTimeInTimezone(tzMenuItem.tz)
480485 }
481486
482487 city: menuData && menuData.label || ""