=== modified file 'components/CurrentWeather.qml' --- components/CurrentWeather.qml 2013-08-05 18:53:33 +0000 +++ components/CurrentWeather.qml 2013-08-19 18:58:54 +0000 @@ -38,286 +38,103 @@ anchors.fill: parent color: "transparent" - Components.WeatherConditionIconComponent { - id: currentCondition2 - width: units.gu(20) - height: units.gu(20) - anchors.horizontalCenter: parent.horizontalCenter - anchors.horizontalCenterOffset: units.gu(-6) - condition: currentWeather.icon - - NumberAnimation on opacity { - id: createAnimation2 - easing.type: Easing.Linear - from: 0 - to: 1 - duration: 1000 - } - - Component.onCompleted: { - createAnimation2.start() - } - } - - Rectangle { - id: rectangle12 - width: units.gu(50) - height: units.gu(10) - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: currentCondition2.bottom - anchors.topMargin: 0 - color: "transparent" - - Column { - id: column12 - width: units.gu(5) - height: units.gu(5) - anchors.rightMargin: units.gu(2) - anchors.verticalCenter: parent.verticalCenter - anchors.right: tempCurrent2.left - visible: showMaxTemp - - Label { - text: i18n.tr("Max.") - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("small") - horizontalAlignment: Text.AlignHCenter - } - - Label { - id: tempMax2 - text: maxTemp+"°"+currentWeather.tempScale - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("large") - horizontalAlignment: Text.AlignHCenter - color: Theme.palette.normal.baseText - } - } - - Text { - width: units.gu(17) - height: units.gu(10) - id: tempCurrent2 - objectName: "CurrentTempText" - text: currentTemp+String("°")+currentWeather.tempScale - style: Text.Normal - font.bold: false - font.family: "Ubuntu" - verticalAlignment: Text.AlignVCenter - anchors.horizontalCenter: parent.horizontalCenter - anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4) - anchors.verticalCenter: parent.verticalCenter - font.pointSize: 52 - horizontalAlignment: Text.AlignHCenter - color: Theme.palette.normal.baseText - } - - Column { - id: column22 - width: units.gu(5) - height: units.gu(5) - anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4) - anchors.verticalCenter: parent.verticalCenter - anchors.left: tempCurrent2.right - - Label { - text: i18n.tr("Min.") - horizontalAlignment: Text.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("small") - color: Theme.palette.normal.baseText - } - - Label { - id: tempMin2 - text: minTemp+"°"+currentWeather.tempScale - horizontalAlignment: Text.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("large") - color: Theme.palette.normal.baseText - } - } - } - - Column { - id: windColumn - anchors.left: currentCondition2.right - anchors.leftMargin: units.gu(3) - height: childrenRect.height - width: childrenRect.width - - Label { - id: windLabel - text: i18n.tr("Wind") - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("small") - color: Theme.palette.normal.baseText - } - Label { - id: windValue - text: currentWeather.windSpeed+" "+currentWeather.speedScale+" "+currentWeather.windDir - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("large") - color: Theme.palette.normal.baseText - } - } - - Column { - id: humidityColumn - anchors.left: currentCondition2.right - anchors.leftMargin: units.gu(3) - anchors.top: windColumn.bottom - anchors.topMargin: units.gu(2) - height: childrenRect.height - width: childrenRect.width - - Label { - id: humidityLabel - text: i18n.tr("Humidity") - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("small") - color: Theme.palette.normal.baseText - } - Label { - id: humidityValue - text: currentWeather.humidity+"%" - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("large") - color: Theme.palette.normal.baseText - } - } - - Column { - id: precipitationColumn - anchors.left: currentCondition2.right - anchors.leftMargin: units.gu(3) - anchors.top: humidityColumn.bottom - anchors.topMargin: units.gu(2) - height: childrenRect.height - width: childrenRect.width - - Label { - id: precipitationLabel - text: i18n.tr("Precipitation") - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("small") - color: Theme.palette.normal.baseText - } - Label { - id: precipitationValue - text: currentWeather.precipitation.toFixed(1)+" "+currentWeather.precipScale - horizontalAlignment: Text.AlignLeft - font.pixelSize: FontUtils.sizeToPixels("large") - color: Theme.palette.normal.baseText + Column { + id: leftColumn + anchors { + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: units.gu(-16) + verticalCenter: parent.verticalCenter + } + spacing: units.gu(1) + + Components.WeatherDetailComponent { + value: currentWeather.humidity + measure: i18n.tr("Humidity") + unit: i18n.tr('%') + width: units.gu(15) + } + + Components.WeatherDetailComponent { + value: currentWeather.windSpeed + measure: i18n.tr("Wind speed") + unit: currentWeather.speedScale + " " + currentWeather.windDir + } + } + + Column { + id: rightColumn + anchors { + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: units.gu(0) + verticalCenter: parent.verticalCenter + } + spacing: units.gu(1) + + Components.WeatherDetailComponent { + value: 1004 + measure: i18n.tr("Pressure") + unit: i18n.tr("mbar") + } + + Components.WeatherDetailComponent { + value: currentWeather.precipitation + measure: i18n.tr("Precipitation") + unit: currentWeather.precipScale } } } front: Rectangle { + color: "transparent" anchors.fill: parent - color: "transparent" - - Components.WeatherConditionIconComponent { + + + UbuntuShape { id: currentCondition - width: units.gu(30) - height: units.gu(30) - anchors.horizontalCenter: parent.horizontalCenter - condition: currentWeather.icon - - NumberAnimation on opacity { - id: createAnimation - easing.type: Easing.Linear - from: 0 - to: 1 - duration: 1000 - } - - Component.onCompleted: { - createAnimation.start() - } - } - - Rectangle { - id: rectangle1 - width: units.gu(50) - height: units.gu(10) - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: currentCondition.bottom - anchors.topMargin: 0 - color: "transparent" - - Column { - id: column1 - width: units.gu(5) - height: units.gu(5) - anchors.rightMargin: units.gu(2) - anchors.verticalCenter: parent.verticalCenter - anchors.right: tempCurrent.left - visible: showMaxTemp - - Label { - text: i18n.tr("Max.") - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("small") - horizontalAlignment: Text.AlignHCenter - } - - Label { - id: tempMax - text: maxTemp+"°"+currentWeather.tempScale - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("large") - horizontalAlignment: Text.AlignHCenter - color: Theme.palette.normal.baseText - } - } - - Text { - width: units.gu(17) - height: units.gu(10) - id: tempCurrent - objectName: "CurrentTempText" - text: currentTemp+String("°")+currentWeather.tempScale - style: Text.Normal - font.bold: false - font.family: "Ubuntu" - verticalAlignment: Text.AlignVCenter - anchors.horizontalCenter: parent.horizontalCenter - anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4) - anchors.verticalCenter: parent.verticalCenter - font.pointSize: 52 - horizontalAlignment: Text.AlignHCenter - color: Theme.palette.normal.baseText - } - - Column { - id: column2 - width: units.gu(5) - height: units.gu(5) - anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4) - anchors.verticalCenter: parent.verticalCenter - anchors.left: tempCurrent.right - - Label { - text: i18n.tr("Min.") - horizontalAlignment: Text.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("small") - color: Theme.palette.normal.baseText - } - - Label { - id: tempMin - text: minTemp+"°"+currentWeather.tempScale - horizontalAlignment: Text.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: FontUtils.sizeToPixels("large") - color: Theme.palette.normal.baseText - } - } - } - } + color: "#20FFFFFF" + radius: "medium" + + width: units.gu(15) + height: units.gu(15) + anchors { + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: units.gu(-8) + verticalCenter: parent.verticalCenter + } + + Components.WeatherConditionIconComponent { + + anchors.fill: parent + anchors.margins: units.gu(1) + condition: currentWeather.icon + + NumberAnimation on opacity { + id: createAnimation + easing.type: Easing.Linear + from: 0 + to: 1 + duration: 1000 + } + + Component.onCompleted: { + createAnimation.start() + } + } + } + + Components.WeatherTemperatureComponent { + currentTemp: currentWeather.currentTemp + minTemp: currentWeather.minTemp + maxTemp: currentWeather.maxTemp + + anchors { + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: units.gu(8) + verticalCenter: parent.verticalCenter + } + } + } transform: Rotation { id: rotation === added file 'components/WeatherDetailComponent.qml' --- components/WeatherDetailComponent.qml 1970-01-01 00:00:00 +0000 +++ components/WeatherDetailComponent.qml 2013-08-19 18:58:54 +0000 @@ -0,0 +1,132 @@ +import QtQuick 2.0 +import QtGraphicalEffects 1.0 +import Ubuntu.Components 0.1 + +UbuntuShape { + id: infoComponent + color: "#20FFFFFF" + radius: "medium" + + width: units.gu(15) + height: units.gu(15) + anchors { + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: units.gu(8) + } + + property real value: 99.99 + property string measure: "Wind speed" + property string unit: "kmph SE" + + Text { + id: measure + text: infoComponent.measure + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("x-small") //9 + fontSizeMode: Text.Fit + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors { + left: parent.left + leftMargin: units.gu(2) + top: parent.top + topMargin: units.gu(2) + } + } + + Rectangle { + id:line1 + color: "#55000000" + anchors { + top: measure.bottom + topMargin: units.gu(0.5) + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: 1 + width: units.gu(10) + } + Rectangle { + color: "#55FFFFFF" + anchors { + top: line1.bottom + bottomMargin: 1 + left: line1.left + right: line1.right + } + height: 1 + width: units.gu(10) + + } + + Text { + id: value + objectName: "CurrentTempText" + text: infoComponent.value.toPrecision() + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("x-large") //36 + fontSizeMode: Text.Fit + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignLeft + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + } + + Rectangle { + id: line2 + color: "#55000000" + anchors { + bottom: unit.top + bottomMargin: units.gu(0.5) + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: 1 + width: units.gu(10) + + } + Rectangle { + color: "#55FFFFFF" + anchors { + top: line2.bottom + bottomMargin: 1 + left: line2.left + right: line2.right + } + height: 1 + width: units.gu(10) + } + + Text { + id: unit + text: infoComponent.unit + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("x-small") //9 + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors { + bottom: parent.bottom + bottomMargin: units.gu(2) + left: parent.left + leftMargin: units.gu(2) + } + } +} === added file 'components/WeatherTemperatureComponent.qml' --- components/WeatherTemperatureComponent.qml 1970-01-01 00:00:00 +0000 +++ components/WeatherTemperatureComponent.qml 2013-08-19 18:58:54 +0000 @@ -0,0 +1,121 @@ +import QtQuick 2.0 +import QtGraphicalEffects 1.0 +import Ubuntu.Components 0.1 + +UbuntuShape { + id: tempComponent + color: "#20FFFFFF" + radius: "medium" + + width: units.gu(15) + height: units.gu(15) + + property int currentTemp: 27 + property int maxTemp: 35 + property int minTemp: 27 + + Text { + id: value + objectName: "CurrentTempText" + text: tempComponent.currentTemp + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: 64 //FontUtils.sizeToPixels("x-large") + font.letterSpacing: -2 + fontSizeMode: Text.Fit + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignRight + height: units.gu(9) + width: units.gu(9) + anchors { + top: parent.top + topMargin: units.gu(1) + left: parent.left + leftMargin: units.gu(1) + } + } + Text { + id: currentTempScale + text: String("°") + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("x-large") //32 + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignLeft + color: Theme.palette.normal.baseText + height: units.gu(9) + anchors { + top: value.top + topMargin: units.gu(0.5) + left: value.right + } + } + + Rectangle { + id: line2 + color: "#55000000" + anchors { + top: value.bottom + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: 1 + width: units.gu(10) + + } + Rectangle { + color: "#55FFFFFF" + anchors { + top: line2.bottom + bottomMargin: 1 + left: line2.left + right: line2.right + } + height: 1 + width: units.gu(10) + + } + + + Text { + id: max + text: i18n.tr("H: ")+tempComponent.maxTemp + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("small") + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors { + bottom: parent.bottom + bottomMargin: units.gu(2) + left: parent.left + leftMargin: units.gu(2) + } + } + + Text { + id: min + text: i18n.tr("L: ")+tempComponent.minTemp + color: Theme.palette.normal.baseText + style: Text.Raised + font.bold: false + font.family: "Ubuntu" + font.pointSize: FontUtils.sizeToPixels("small") + fontSizeMode: Text.Fit + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + anchors { + bottom: parent.bottom + bottomMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + } +} === modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py' --- tests/autopilot/ubuntu_weather_app/tests/test_settings.py 2013-08-14 20:28:56 +0000 +++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py 2013-08-19 18:58:54 +0000 @@ -38,11 +38,11 @@ """Checks selected units by values from the first location tab""" current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText') if units == "imperial": - self.assertThat(current_temps[0].text, Eventually(Equals(u'70°F'))) - self.assertThat(current_temps[2].text, Eventually(Equals(u'73°F'))) + self.assertThat(current_temps[0].text, Eventually(Equals(u'70'))) + self.assertThat(current_temps[1].text, Eventually(Equals(u'73'))) else: - self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C'))) - self.assertThat(current_temps[2].text, Eventually(Equals(u'23°C'))) + self.assertThat(current_temps[0].text, Eventually(Equals(u'21'))) + self.assertThat(current_temps[1].text, Eventually(Equals(u'23'))) def test_switch_scale(self): """Tests switching the scale in the settings"""