1
=== modified file 'components/LocationTab.qml'
2
--- components/LocationTab.qml	2013-07-22 19:26:39 +0000
3
+++ components/LocationTab.qml	2013-07-22 21:43:24 +0000
4
@@ -68,68 +68,56 @@
5
68
    page: Page {
68
    page: Page {
6
69
        id: locationPage
69
        id: locationPage
7
70
        isLeaf: true
70
        isLeaf: true
8
71
        anchors.top: locationTab.top
9
72
        anchors.fill: parent
71
        anchors.fill: parent
62
73
72
        anchors.topMargin: units.gu(9.5)
63
74
73
64
75
        Rectangle {
74
        ListModel {
65
76
            id: listContainer
75
            id: dayForecastModel
66
77
76
        }
67
78
            anchors.fill: parent
77
68
79
            // TODO: Fix that hardcoded value
78
        ListView {
69
80
            anchors.topMargin: units.gu(9.5)
79
            id: dailyForecastList
70
81
            color: "transparent"
80
            width: parent.width
71
82
81
            height:parent.height
72
83
            ListModel {
82
            model:dayForecastModel
73
84
                id: dayForecastModel
83
74
85
            }
84
            snapMode: ListView.SnapOneItem
75
86
85
            verticalLayoutDirection: ListView.TopToBottom
76
87
            ListView {
86
            flickableDirection: Flickable.VerticalFlick
77
88
                id: dailyForecastList
87
78
89
                anchors.fill: parent
88
            clip: true
79
90
                anchors.top: parent.top
89
80
91
90
            delegate: Item {
81
92
                model:dayForecastModel
91
                id: dailyForecastItem
82
93
92
                width:parent.width
83
94
                snapMode: ListView.SnapOneItem
93
                height: locationPage.height
84
95
                verticalLayoutDirection: ListView.TopToBottom
94
85
96
                flickableDirection: Flickable.VerticalFlick
95
                Rectangle {
86
97
96
                    id: listRectangle
87
98
                clip: true
97
                    width: parent.width
88
99
98
                    height: dailyForecastList.height
89
100
                delegate: Item {
99
                    anchors.verticalCenter: parent.verticalCenter
90
101
                    id: dailyForecastItem
100
                    color: "transparent"
91
102
                    width:parent.width
101
92
103
                    height: listContainer.height
102
                    DateComponent {
93
104
103
                        id: dateComponent
94
105
                    Rectangle {
104
                        dateRelative: dateRel
95
106
                        width: parent.width
105
                        dateString: date
96
107
                        height: childrenRect.height
106
                        borderTopVisible: false
97
108
                        anchors.verticalCenter: parent.verticalCenter
107
                    }
98
109
                        color: "transparent"
108
                    CurrentWeather {
99
110
109
                        currentTemp: temp
100
111
                        DateComponent {
110
                        minTemp: tempMin
101
112
                            id: dateComponent
111
                        maxTemp: tempMax
102
113
                            dateRelative: dateRel
112
                        icon: condIcon
103
114
                            dateString: date
113
                        condition: cond
104
115
                            borderTopVisible: false
114
                        anchors.top: dateComponent.bottom
53
116
                        }
54
117
                        CurrentWeather {
55
118
                            currentTemp: temp
56
119
                            minTemp: tempMin
57
120
                            maxTemp: tempMax
58
121
                            icon: condIcon
59
122
                            condition: cond
60
123
                            anchors.top: dateComponent.bottom
61
124
                        }
105
125
                    }
115
                    }
106
126
                }
116
                }
107
127
            }
117
            }
108
128
        }
118
        }
109
129
119
110
130
120
111
131
112
132
113
133
        tools: ToolbarItems {
121
        tools: ToolbarItems {
114
134
            id: pageTools
122
            id: pageTools
115
135
            ToolbarButton {
123
            ToolbarButton {
Status:	Merged
Approved by:	Martin Borho on 2013-07-23
Approved revision:	75
Merged at revision:	75
Proposed branch:	lp:~martin-borho/ubuntu-weather-app/TabPage-spacer
Merge into:	lp:ubuntu-weather-app/obsolete.trunk
Diff against target:	115 lines (+43/-55) 1 file modified components/LocationTab.qml (+43/-55)
To merge this branch:	bzr merge lp:~martin-borho/ubuntu-weather-app/TabPage-spacer
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-07-22
Raúl Yeguas		2013-07-22	Approve on 2013-07-22
Review via email: mp+176288@code.launchpad.net