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

Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 682
Merged at revision: 686
Proposed branch: lp:~fboucault/unity-2d/dash_updated_font_size
Merge into: lp:unity-2d/3.0
Diff against target: 199 lines (+26/-10)
12 files modified
places/GroupHeader.qml (+2/-1)
places/Home.qml (+1/-1)
places/HomeButton.qml (+1/-1)
places/SearchEntry.qml (+2/-2)
places/SearchRefine.qml (+1/-1)
places/SearchRefineOptionType.qml (+1/-1)
places/TextCustom.qml (+10/-1)
places/TickBox.qml (+1/-1)
places/UnityDefaultRenderer.qml (+1/-0)
places/UnityEmptySearchRenderer.qml (+1/-1)
places/UnityFileInfoRenderer.qml (+3/-0)
places/UnityHorizontalTileRenderer.qml (+2/-0)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_updated_font_size
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+72599@code.launchpad.net

Description of the change

[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.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

Clean. Merged!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
54 TextCustom {54 TextCustom {
55 id: title55 id: title
5656
57 font.pixelSize: 1657 fontSize: "large"
58 anchors.baseline: underline.top58 anchors.baseline: underline.top
59 anchors.baselineOffset: -1059 anchors.baselineOffset: -10
60 anchors.left: iconImage.right60 anchors.left: iconImage.right
@@ -84,6 +84,7 @@
84 TextCustom {84 TextCustom {
85 id: label85 id: label
8686
87 fontSize: "small"
87 text: if(groupHeader.folded) {88 text: if(groupHeader.folded) {
88 if(availableCount == 1) {89 if(availableCount == 1) {
89 return u2d.tr("See one more result")90 return u2d.tr("See one more result")
9091
=== 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 @@
80 anchors.leftMargin: 380 anchors.leftMargin: 3
81 width: paintedWidth81 width: paintedWidth
82 height: icon.height82 height: icon.height
83 font.pixelSize: 1683 fontSize: "large"
84 horizontalAlignment: Text.AlignHCenter84 horizontalAlignment: Text.AlignHCenter
85 verticalAlignment: Text.AlignVCenter85 verticalAlignment: Text.AlignVCenter
86 }86 }
8787
=== 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 @@
61 anchors.leftMargin: 761 anchors.leftMargin: 7
62 height: 4062 height: 40
63 font.bold: true63 font.bold: true
64 font.pixelSize: 1664 fontSize: "large"
65 }65 }
66}66}
6767
=== 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 @@
145 }145 }
146 }146 }
147147
148 Text {148 TextCustom {
149 id: search_instructions149 id: search_instructions
150150
151 anchors.left: parent.left151 anchors.left: parent.left
@@ -154,7 +154,7 @@
154154
155 color: "white"155 color: "white"
156 opacity: 0.5156 opacity: 0.5
157 font.pixelSize: 20157 fontSize: "x-large"
158 font.italic: true158 font.italic: true
159 text: {159 text: {
160 if(search_input.text)160 if(search_input.text)
161161
=== 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 @@
6666
67 text: u2d.tr("Filter results")67 text: u2d.tr("Filter results")
68 font.bold: true68 font.bold: true
69 font.pixelSize: 1669 fontSize: "large"
70 font.underline: parent.state == "selected"70 font.underline: parent.state == "selected"
7171
72 anchors.verticalCenter: parent.verticalCenter72 anchors.verticalCenter: parent.verticalCenter
7373
=== 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 @@
39 anchors.left: parent.left39 anchors.left: parent.left
4040
41 text: searchRefineOption.title41 text: searchRefineOption.title
42 font.pixelSize: 1642 fontSize: "large"
43 font.bold: true43 font.bold: true
44 font.underline: ( parent.state == "selected" || parent.state == "hovered" )44 font.underline: ( parent.state == "selected" || parent.state == "hovered" )
45 }45 }
4646
=== 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 @@
22Text {22Text {
23 color: "#ffffff"23 color: "#ffffff"
24// font.family: "UbuntuBeta"24// font.family: "UbuntuBeta"
25// font.pointSize: 1025 property string fontSize: "medium"
26 font.pixelSize: {
27 switch (fontSize) {
28 case "small": return 13
29 case "medium": return 15
30 case "large": return 16
31 case "x-large": return 20
32 default: return 14
33 }
34 }
26}35}
2736
=== 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 @@
55 width: parent.width55 width: parent.width
56 horizontalAlignment: Text.AlignHCenter56 horizontalAlignment: Text.AlignHCenter
57 verticalAlignment: Text.AlignVCenter57 verticalAlignment: Text.AlignVCenter
58 font.pixelSize: 1558 fontSize: "medium"
59 color: "white"59 color: "white"
60 text: tickBox.text60 text: tickBox.text
61 elide: Text.ElideRight61 elide: Text.ElideRight
6262
=== 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 @@
97 anchors.topMargin: 1097 anchors.topMargin: 10
98 anchors.rightMargin: 398 anchors.rightMargin: 3
99 anchors.leftMargin: 399 anchors.leftMargin: 3
100 fontSize: "small"
100 }101 }
101 }102 }
102 }103 }
103104
=== 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 @@
6161
62 TextCustom {62 TextCustom {
63 text: displayName63 text: displayName
64 font.pixelSize: 1664 fontSize: "large"
65 anchors.left: parent.left65 anchors.left: parent.left
66 anchors.leftMargin: 866 anchors.leftMargin: 8
67 anchors.right: parent.right67 anchors.right: parent.right
6868
=== 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 @@
84 text: displayName84 text: displayName
85 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"85 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
86 elide: Text.ElideMiddle86 elide: Text.ElideMiddle
87 fontSize: "small"
8788
88 width: parent.width89 width: parent.width
89 height: paintedHeight90 height: paintedHeight
@@ -93,6 +94,7 @@
93 text: parentDirectory94 text: parentDirectory
94 color: button.state == "pressed" ? "#7e7e7e" : "#c8c8c8"95 color: button.state == "pressed" ? "#7e7e7e" : "#c8c8c8"
95 elide: Text.ElideMiddle96 elide: Text.ElideMiddle
97 fontSize: "small"
9698
97 width: parent.width99 width: parent.width
98 height: paintedHeight100 height: paintedHeight
@@ -102,6 +104,7 @@
102 text: comment104 text: comment
103 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"105 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
104 elide: Text.ElideMiddle106 elide: Text.ElideMiddle
107 fontSize: "small"
105108
106 width: parent.width109 width: parent.width
107 height: paintedHeight110 height: paintedHeight
108111
=== 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 @@
105 text: displayName105 text: displayName
106 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"106 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
107 elide: Text.ElideMiddle107 elide: Text.ElideMiddle
108 fontSize: "small"
108109
109 anchors.left: parent.left110 anchors.left: parent.left
110 anchors.right: parent.right111 anchors.right: parent.right
@@ -117,6 +118,7 @@
117118
118 text: comment119 text: comment
119 color: button.state == "pressed" ? "#888888" : "#cccccc"120 color: button.state == "pressed" ? "#888888" : "#cccccc"
121 fontSize: "small"
120122
121 anchors.left: parent.left123 anchors.left: parent.left
122 anchors.right: parent.right124 anchors.right: parent.right

Subscribers

People subscribed via source and target branches