Merge lp:~fboucault/unity-2d/dash_updated_font_size into lp:unity-2d/3.0

[Florian Boucault]

[dash] New TextCustom.fontSize property that takes a textual description of the
size (e.g. 'small', 'medium', etc.) thus ensuring font size consistency accross
the user interface.
Fixed font sizes to match the latest designs.

[Gerry Boland (gerboland)]

Clean. Merged!

review: Approve

=== modified file 'places/GroupHeader.qml'
--- places/GroupHeader.qml	2011-08-09 16:18:45 +0000
+++ places/GroupHeader.qml	2011-08-23 16:22:23 +0000
@@ -54,7 +54,7 @@
     TextCustom {
         id: title
 
-        font.pixelSize: 16
+        fontSize: "large"
         anchors.baseline: underline.top
         anchors.baselineOffset: -10
         anchors.left: iconImage.right
@@ -84,6 +84,7 @@
         TextCustom {
             id: label
 
+            fontSize: "small"
             text: if(groupHeader.folded) {
                       if(availableCount == 1) {
                           return u2d.tr("See one more result")

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-08-10 10:01:52 +0000
+++ places/Home.qml	2011-08-23 16:22:23 +0000
@@ -80,7 +80,7 @@
             anchors.leftMargin: 3
             width: paintedWidth
             height: icon.height
-            font.pixelSize: 16
+            fontSize: "large"
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }

=== modified file 'places/HomeButton.qml'
--- places/HomeButton.qml	2011-08-23 15:47:49 +0000
+++ places/HomeButton.qml	2011-08-23 16:22:23 +0000
@@ -61,6 +61,6 @@
         anchors.leftMargin: 7
         height: 40
         font.bold: true
-        font.pixelSize: 16
+        fontSize: "large"
     }
 }

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-08-09 16:18:45 +0000
+++ places/SearchEntry.qml	2011-08-23 16:22:23 +0000
@@ -145,7 +145,7 @@
                 }
             }
 
-            Text {
+            TextCustom {
                 id: search_instructions
 
                 anchors.left: parent.left
@@ -154,7 +154,7 @@
 
                 color: "white"
                 opacity: 0.5
-                font.pixelSize: 20
+                fontSize: "x-large"
                 font.italic: true
                 text: {
                     if(search_input.text)

=== modified file 'places/SearchRefine.qml'
--- places/SearchRefine.qml	2011-08-23 15:00:31 +0000
+++ places/SearchRefine.qml	2011-08-23 16:22:23 +0000
@@ -66,7 +66,7 @@
 
             text: u2d.tr("Filter results")
             font.bold: true
-            font.pixelSize: 16
+            fontSize: "large"
             font.underline: parent.state == "selected"
 
             anchors.verticalCenter: parent.verticalCenter

=== modified file 'places/SearchRefineOptionType.qml'
--- places/SearchRefineOptionType.qml	2011-08-23 15:00:31 +0000
+++ places/SearchRefineOptionType.qml	2011-08-23 16:22:23 +0000
@@ -39,7 +39,7 @@
             anchors.left: parent.left
 
             text: searchRefineOption.title
-            font.pixelSize: 16
+            fontSize: "large"
             font.bold: true
             font.underline: ( parent.state == "selected" || parent.state == "hovered" )
         }

=== modified file 'places/TextCustom.qml'
--- places/TextCustom.qml	2011-06-23 17:08:53 +0000
+++ places/TextCustom.qml	2011-08-23 16:22:23 +0000
@@ -22,5 +22,14 @@
 Text {
     color: "#ffffff"
 //    font.family: "UbuntuBeta"
-//    font.pointSize: 10
+    property string fontSize: "medium"
+    font.pixelSize: {
+        switch (fontSize) {
+            case "small": return 13
+            case "medium": return 15
+            case "large": return 16
+            case "x-large": return 20
+            default: return 14
+        }
+    }
 }

=== modified file 'places/TickBox.qml'
--- places/TickBox.qml	2011-08-22 12:34:29 +0000
+++ places/TickBox.qml	2011-08-23 16:22:23 +0000
@@ -55,7 +55,7 @@
         width: parent.width
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        font.pixelSize: 15
+        fontSize: "medium"
         color: "white"
         text: tickBox.text
         elide: Text.ElideRight

=== modified file 'places/UnityDefaultRenderer.qml'
--- places/UnityDefaultRenderer.qml	2011-08-23 15:47:49 +0000
+++ places/UnityDefaultRenderer.qml	2011-08-23 16:22:23 +0000
@@ -97,6 +97,7 @@
                 anchors.topMargin: 10
                 anchors.rightMargin: 3
                 anchors.leftMargin: 3
+                fontSize: "small"
             }
         }
     }

=== modified file 'places/UnityEmptySearchRenderer.qml'
--- places/UnityEmptySearchRenderer.qml	2011-07-24 16:23:00 +0000
+++ places/UnityEmptySearchRenderer.qml	2011-08-23 16:22:23 +0000
@@ -61,7 +61,7 @@
 
             TextCustom {
                 text: displayName
-                font.pixelSize: 16
+                fontSize: "large"
                 anchors.left: parent.left
                 anchors.leftMargin: 8
                 anchors.right: parent.right

=== modified file 'places/UnityFileInfoRenderer.qml'
--- places/UnityFileInfoRenderer.qml	2011-08-23 15:47:49 +0000
+++ places/UnityFileInfoRenderer.qml	2011-08-23 16:22:23 +0000
@@ -84,6 +84,7 @@
                     text: displayName
                     color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
                     elide: Text.ElideMiddle
+                    fontSize: "small"
 
                     width: parent.width
                     height: paintedHeight
@@ -93,6 +94,7 @@
                     text: parentDirectory
                     color: button.state == "pressed" ? "#7e7e7e" : "#c8c8c8"
                     elide: Text.ElideMiddle
+                    fontSize: "small"
 
                     width: parent.width
                     height: paintedHeight
@@ -102,6 +104,7 @@
                     text: comment
                     color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
                     elide: Text.ElideMiddle
+                    fontSize: "small"
 
                     width: parent.width
                     height: paintedHeight

=== modified file 'places/UnityHorizontalTileRenderer.qml'
--- places/UnityHorizontalTileRenderer.qml	2011-06-22 12:47:52 +0000
+++ places/UnityHorizontalTileRenderer.qml	2011-08-23 16:22:23 +0000
@@ -105,6 +105,7 @@
                     text: displayName
                     color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
                     elide: Text.ElideMiddle
+                    fontSize: "small"
 
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -117,6 +118,7 @@
 
                     text: comment
                     color: button.state == "pressed" ? "#888888" : "#cccccc"
+                    fontSize: "small"
 
                     anchors.left: parent.left
                     anchors.right: parent.right