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

Proposed by Florian Boucault on 2011-08-23
Status: Merged
Approved by: Florian Boucault on 2011-08-25
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 2011-08-23 Approve on 2011-08-23
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
1=== modified file 'places/GroupHeader.qml'
2--- places/GroupHeader.qml 2011-08-09 16:18:45 +0000
3+++ places/GroupHeader.qml 2011-08-23 16:22:23 +0000
4@@ -54,7 +54,7 @@
5 TextCustom {
6 id: title
7
8- font.pixelSize: 16
9+ fontSize: "large"
10 anchors.baseline: underline.top
11 anchors.baselineOffset: -10
12 anchors.left: iconImage.right
13@@ -84,6 +84,7 @@
14 TextCustom {
15 id: label
16
17+ fontSize: "small"
18 text: if(groupHeader.folded) {
19 if(availableCount == 1) {
20 return u2d.tr("See one more result")
21
22=== modified file 'places/Home.qml'
23--- places/Home.qml 2011-08-10 10:01:52 +0000
24+++ places/Home.qml 2011-08-23 16:22:23 +0000
25@@ -80,7 +80,7 @@
26 anchors.leftMargin: 3
27 width: paintedWidth
28 height: icon.height
29- font.pixelSize: 16
30+ fontSize: "large"
31 horizontalAlignment: Text.AlignHCenter
32 verticalAlignment: Text.AlignVCenter
33 }
34
35=== modified file 'places/HomeButton.qml'
36--- places/HomeButton.qml 2011-08-23 15:47:49 +0000
37+++ places/HomeButton.qml 2011-08-23 16:22:23 +0000
38@@ -61,6 +61,6 @@
39 anchors.leftMargin: 7
40 height: 40
41 font.bold: true
42- font.pixelSize: 16
43+ fontSize: "large"
44 }
45 }
46
47=== modified file 'places/SearchEntry.qml'
48--- places/SearchEntry.qml 2011-08-09 16:18:45 +0000
49+++ places/SearchEntry.qml 2011-08-23 16:22:23 +0000
50@@ -145,7 +145,7 @@
51 }
52 }
53
54- Text {
55+ TextCustom {
56 id: search_instructions
57
58 anchors.left: parent.left
59@@ -154,7 +154,7 @@
60
61 color: "white"
62 opacity: 0.5
63- font.pixelSize: 20
64+ fontSize: "x-large"
65 font.italic: true
66 text: {
67 if(search_input.text)
68
69=== modified file 'places/SearchRefine.qml'
70--- places/SearchRefine.qml 2011-08-23 15:00:31 +0000
71+++ places/SearchRefine.qml 2011-08-23 16:22:23 +0000
72@@ -66,7 +66,7 @@
73
74 text: u2d.tr("Filter results")
75 font.bold: true
76- font.pixelSize: 16
77+ fontSize: "large"
78 font.underline: parent.state == "selected"
79
80 anchors.verticalCenter: parent.verticalCenter
81
82=== modified file 'places/SearchRefineOptionType.qml'
83--- places/SearchRefineOptionType.qml 2011-08-23 15:00:31 +0000
84+++ places/SearchRefineOptionType.qml 2011-08-23 16:22:23 +0000
85@@ -39,7 +39,7 @@
86 anchors.left: parent.left
87
88 text: searchRefineOption.title
89- font.pixelSize: 16
90+ fontSize: "large"
91 font.bold: true
92 font.underline: ( parent.state == "selected" || parent.state == "hovered" )
93 }
94
95=== modified file 'places/TextCustom.qml'
96--- places/TextCustom.qml 2011-06-23 17:08:53 +0000
97+++ places/TextCustom.qml 2011-08-23 16:22:23 +0000
98@@ -22,5 +22,14 @@
99 Text {
100 color: "#ffffff"
101 // font.family: "UbuntuBeta"
102-// font.pointSize: 10
103+ property string fontSize: "medium"
104+ font.pixelSize: {
105+ switch (fontSize) {
106+ case "small": return 13
107+ case "medium": return 15
108+ case "large": return 16
109+ case "x-large": return 20
110+ default: return 14
111+ }
112+ }
113 }
114
115=== modified file 'places/TickBox.qml'
116--- places/TickBox.qml 2011-08-22 12:34:29 +0000
117+++ places/TickBox.qml 2011-08-23 16:22:23 +0000
118@@ -55,7 +55,7 @@
119 width: parent.width
120 horizontalAlignment: Text.AlignHCenter
121 verticalAlignment: Text.AlignVCenter
122- font.pixelSize: 15
123+ fontSize: "medium"
124 color: "white"
125 text: tickBox.text
126 elide: Text.ElideRight
127
128=== modified file 'places/UnityDefaultRenderer.qml'
129--- places/UnityDefaultRenderer.qml 2011-08-23 15:47:49 +0000
130+++ places/UnityDefaultRenderer.qml 2011-08-23 16:22:23 +0000
131@@ -97,6 +97,7 @@
132 anchors.topMargin: 10
133 anchors.rightMargin: 3
134 anchors.leftMargin: 3
135+ fontSize: "small"
136 }
137 }
138 }
139
140=== modified file 'places/UnityEmptySearchRenderer.qml'
141--- places/UnityEmptySearchRenderer.qml 2011-07-24 16:23:00 +0000
142+++ places/UnityEmptySearchRenderer.qml 2011-08-23 16:22:23 +0000
143@@ -61,7 +61,7 @@
144
145 TextCustom {
146 text: displayName
147- font.pixelSize: 16
148+ fontSize: "large"
149 anchors.left: parent.left
150 anchors.leftMargin: 8
151 anchors.right: parent.right
152
153=== modified file 'places/UnityFileInfoRenderer.qml'
154--- places/UnityFileInfoRenderer.qml 2011-08-23 15:47:49 +0000
155+++ places/UnityFileInfoRenderer.qml 2011-08-23 16:22:23 +0000
156@@ -84,6 +84,7 @@
157 text: displayName
158 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
159 elide: Text.ElideMiddle
160+ fontSize: "small"
161
162 width: parent.width
163 height: paintedHeight
164@@ -93,6 +94,7 @@
165 text: parentDirectory
166 color: button.state == "pressed" ? "#7e7e7e" : "#c8c8c8"
167 elide: Text.ElideMiddle
168+ fontSize: "small"
169
170 width: parent.width
171 height: paintedHeight
172@@ -102,6 +104,7 @@
173 text: comment
174 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
175 elide: Text.ElideMiddle
176+ fontSize: "small"
177
178 width: parent.width
179 height: paintedHeight
180
181=== modified file 'places/UnityHorizontalTileRenderer.qml'
182--- places/UnityHorizontalTileRenderer.qml 2011-06-22 12:47:52 +0000
183+++ places/UnityHorizontalTileRenderer.qml 2011-08-23 16:22:23 +0000
184@@ -105,6 +105,7 @@
185 text: displayName
186 color: button.state == "pressed" ? "#5e5e5e" : "#ffffff"
187 elide: Text.ElideMiddle
188+ fontSize: "small"
189
190 anchors.left: parent.left
191 anchors.right: parent.right
192@@ -117,6 +118,7 @@
193
194 text: comment
195 color: button.state == "pressed" ? "#888888" : "#cccccc"
196+ fontSize: "small"
197
198 anchors.left: parent.left
199 anchors.right: parent.right

Subscribers

People subscribed via source and target branches