git.iko.soy/unity8
on xenial help sign in
no need for a local instance of TimeFormatter
7f93f50Lukáš Tinkl
qml/Panel/Indicators/MenuItemFactory.qml+7−2
compare with xenial
unifiedsplit
@@ -79,6 +79,11 @@ Item {
79 return defaultValue;
79 return defaultValue;
80 }
80 }
81
81
82+ Utils.TimeFormatter
83+ {
84+ id: tzFormatter
85+ }
86+
82 Component {
87 Component {
83 id: separatorMenu;
88 id: separatorMenu;
84
89
@@ -457,6 +462,7 @@ Item {
457 Menus.CalendarMenu {
462 Menus.CalendarMenu {
458 objectName: "calendarMenu"
463 objectName: "calendarMenu"
459 highlightWhenPressed: false
464 highlightWhenPressed: false
465+ focus: true
460 }
466 }
461 }
467 }
462
468
@@ -472,11 +478,10 @@ Item {
472 property int menuIndex: -1
478 property int menuIndex: -1
473 property var extendedData: menuData && menuData.ext || undefined
479 property var extendedData: menuData && menuData.ext || undefined
474 readonly property var tz: getExtendedProperty(extendedData, "xCanonicalTimezone", "UTC")
480 readonly property var tz: getExtendedProperty(extendedData, "xCanonicalTimezone", "UTC")
475− property var tzFormatter: Utils.TimeFormatter {}
476 property var updateTimer: Timer {
481 property var updateTimer: Timer {
477 repeat: true
482 repeat: true
478 running: identifier == "indicator-datetime" // only run when we're open
483 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)
480 }
485 }
481
486
482 city: menuData && menuData.label || ""
487 city: menuData && menuData.label || ""