← Back to branch summary

~dpm/ubuntu-weather-app/desktop-file-i18n

« back to all changes in this revision

Viewing changes to components/LocationTab.qml

  • Committer: Tarmac
  • Author(s): Raúl Yeguas, neokore
  • Date: 2013-04-22 14:33:33 UTC
  • mfrom: (4.3.3 currentWeatherAnimations)
  • Revision ID: tarmac-20130422143333-c44rc9ljdl97jwdm
Added a WeatherConditionIcon component with animations and transitions.

Approved by Martin Borho, Ubuntu Phone Apps Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
components/LocationTab.qml
30
30
        todayDateComponent.renderText()
31
31
 
32
32
        // set current Condition
33
 
        currentCondition.condition = 801; //currentData.condition.id;
 
33
        currentCondition.condition = currentData.condition.id;
 
34
        currentCondition.icon = currentData.condition.icon;
34
35
        currentCondition.currentTemp =  currentData.temp;
35
36
        currentCondition.minTemp = currentData.temp_min;
36
37
        currentCondition.maxTemp = currentData.temp_max;
44
45
                date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
45
46
                temp: dailyForecasts[x].temp,
46
47
                tempMin: dailyForecasts[x].night,
47
 
                cond: 801 // dailyForecasts[x].condition.id;
 
48
                cond: dailyForecasts[x].condition.id,
 
49
                condIcon: dailyForecasts[x].condition.icon
48
50
            });
49
51
        }
50
52
    }
111
113
                CurrentWeather {
112
114
                    id: currentCondition
113
115
                    anchors.top: todayDateComponent.bottom
114
 
                    condition: 801
115
116
                }
116
117
                /*ChartComponent{
117
118
                    id: chartComponent
138
139
                            temperature: temp
139
140
                            temperatureMin: tempMin
140
141
                            condition: cond
 
142
                            icon: condIcon
141
143
                        }
142
144
                    }
143
145
                }