Merge lp:~nik90/ubuntu-clock-app/clock-fontsizes into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Tweak clock font sizes accorded to updated designs

Tweak clock font sizes accorded to updated designs

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:110
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/75/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/40
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/75

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/75/rebuild

review: Approve (continuous-integration)

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-06-15 20:15:44 +0000
+++ clock/ClockPage.qml	2013-06-21 16:15:32 +0000
@@ -67,7 +67,7 @@
         Component.onCompleted: {
             _loadDB();
             diff = worldModel.timeDiff;
-            currentLocation.text = worldModel.city;
+            currentLocationCity.text = worldModel.city;
             currentTimeFormatted = Qt.formatTime(new Date(currentTimeStamp + (diff * 60000)), "hh:mm")
         }
     }
@@ -107,7 +107,7 @@
         AnalogClockFace {
             id: clockFace
 
-            anchors { top: parent.top; topMargin: units.gu(17); horizontalCenter: parent.horizontalCenter }
+            anchors { top: parent.top; topMargin: units.gu(9); horizontalCenter: parent.horizontalCenter }
             Component.onCompleted: easterEggCircle.reloadSunRiseModel()
 
             onClicked: {
@@ -146,33 +146,58 @@
             id: savedWorldClock
 
             height: childrenRect.height;
-            anchors { left:parent.left; right:parent.right; top: clockFace.bottom; topMargin: units.gu(12)}
+            anchors { left:parent.left; right:parent.right; top: clockFace.bottom; topMargin: units.gu(13)}
 
             ListItem.ThinDivider {}
 
-            ListItem.Header { text: i18n.tr("Current Location") }
+            ListItem.Header {
+                Label {
+                    text: i18n.tr("Current Location")
+                    anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(2) }
+                    fontSize: "medium"
+                }
+            }
 
-            ListItem.SingleValue {
+            ListItem.Standard {
                 id: currentLocation
-                text: "UTC"
-                value: Qt.formatTime(new Date(currentTimeStamp + (diff * 60000)), "hh:mm A");
+                Label {
+                    id: currentLocationCity
+                    text: i18n.tr("UTC")
+                    anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
+                    fontSize: "large"
+                }                
+                Label {
+                    text: Qt.formatTime(new Date(currentTimeStamp + (diff * 60000)), "hh:mm A");
+                    anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
+                    fontSize: "large"
+                }
             }
 
-            ListItem.Header { text: i18n.tr("World") }
+            ListItem.Header {
+                Label {
+                    text: i18n.tr("World")
+                    anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(2) }
+                    fontSize: "medium"
+                }
+            }
 
             ListView {
                 id: listWorldClocks
 
                 anchors { left: parent.left; right: parent.right }
-                height: units.gu(30)
+                height: units.gu(21)
                 model: worldModel
                 currentIndex: -1
 
                 delegate: ListItem.Standard {
-                    text: cityName;
+                    Label {
+                        text: cityName;
+                        anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
+                        fontSize: "large"
+                    }
 
                     Label {
-                        fontSize: "medium"
+                        fontSize: "large"
                         text: Qt.formatTime(new Date(currentTimeStamp + (rawOffSet * 60000)), "hh:mm A");
                         anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
                     }
@@ -191,7 +216,7 @@
                     }
 
                     onClicked: {
-                        currentLocation.text = cityName;
+                        currentLocationCity.text = cityName;
                         diff = rawOffSet;
                         worldModel.appendCurrentLocation(cityName, diff);
                     }

=== modified file 'clock/EasterEgg.qml'
--- clock/EasterEgg.qml	2013-06-10 14:14:12 +0000
+++ clock/EasterEgg.qml	2013-06-21 16:15:32 +0000
@@ -81,7 +81,7 @@
             id: sunriseLabel
             anchors.horizontalCenter: parent.horizontalCenter
             color: Constants.brightWhite;
-            fontSize: "small";
+            fontSize: "medium";
             text: i18n.tr("Sunrise")
         }
         
@@ -89,7 +89,7 @@
             id: sunriseTimeLabel
             anchors.horizontalCenter: parent.horizontalCenter
             color: Constants.brightWhite;
-            font.pixelSize: 35;
+            fontSize: "x-large";
             text: i18n.tr("loading")
         }
         
@@ -106,7 +106,7 @@
             width: parent.width
             horizontalAlignment: Text.AlignHCenter
             color: Constants.brightWhite;
-            font.pixelSize: 35;
+            fontSize: "x-large";
             text: i18n.tr("loading")
         }
         
@@ -115,7 +115,7 @@
             width: parent.width
             horizontalAlignment: Text.AlignHCenter
             color: Constants.brightWhite;
-            fontSize: "small";
+            fontSize: "medium";
             text: i18n.tr("Sunset")
         }
         

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-06-15 22:46:44 +0000
+++ clock/WorldClock.qml	2013-06-21 16:15:32 +0000
@@ -12,7 +12,7 @@
     property string city: "null";
     property real lng: 0;
     property real lat: 0;
-    property real rawOffSet: 0;
+    property real rawOffSet: 0;    
 
     // Property to store the city searched by the user
     property string search_string: "null";
@@ -124,7 +124,11 @@
         Component {
             id: sectionHeading
             ListItem.Header {
-                text: section
+                Label {
+                    text: section
+                    anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(2) }
+                    fontSize: "medium"
+                }
             }
         }
 
@@ -134,7 +138,11 @@
         section.labelPositioning: ViewSection.InlineLabels
 
         delegate: ListItem.Standard {
-            text: searchCityModel.status == XmlListModel.Ready ? searchCityModel.get(index).city + ", " + searchCityModel.get(index).country : i18n.tr("Loading...");
+            Label {
+                text: searchCityModel.status == XmlListModel.Ready ? searchCityModel.get(index).city + ", " + searchCityModel.get(index).country : i18n.tr("Loading...");
+                anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
+                fontSize: "large"
+            }
             selected: worldList.currentIndex == index;
 
             onClicked: {

=== modified file 'common/SwipeDelete.qml'
--- common/SwipeDelete.qml	2013-06-15 14:21:07 +0000
+++ common/SwipeDelete.qml	2013-06-21 16:15:32 +0000
@@ -34,8 +34,7 @@
         anchors.fill: parent
         verticalAlignment: Text.AlignVCenter
         color: Constants.brightWhite
-        fontSize: "medium"
-        font.bold: true
+        fontSize: "large"
     }
 
     states: [