@@ -29,6 +29,10 @@ LocalComponents.Page {
30 property alias selectedTimeZone: tzModel.selectedZoneId
30 property alias selectedTimeZone: tzModel.selectedZoneId
32+ UbuntuTimeDatePanel {
32 TimeZoneModel {
36 TimeZoneModel {
33 id: tzModel
37 id: tzModel
@@ -110,14 +114,14 @@ LocalComponents.Page {
110 ListView {
114 ListView {
111 id: tzList;
115 id: tzList;
113− boundsBehavior: Flickable.StopAtBounds;
117+ boundsBehavior: Flickable.StopAtBounds
114 clip: true;
118 clip: true;
115 currentIndex: -1
119 currentIndex: -1
116 snapMode: ListView.SnapToItem
120 snapMode: ListView.SnapToItem
118 anchors {
122 anchors {
119− left: parent.left;
123+ left: parent.left
120− right: parent.right;
124+ right: parent.right
123 height: column.height - searchField.height - column.spacing - topMargin
127 height: column.height - searchField.height - column.spacing - topMargin
@@ -132,7 +136,7 @@ LocalComponents.Page {
132 text: i18n.tr("Next")
136 text: i18n.tr("Next")
133 enabled: selectedTimeZone != ""
137 enabled: selectedTimeZone != ""
134 onClicked: {
138 onClicked: {
135− UbuntuTimeDatePanel.timeZone = selectedTimeZone;
139+ timeDatePanel.timeZone = selectedTimeZone;
136 pageStack.next();
140 pageStack.next();