Merge lp:~nataliabidart/ubuntuone-control-panel/tweak-overview into lp:ubuntuone-control-panel
- tweak-overview
- Merge into trunk
Proposed by
Natalia Bidart
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||||||
Approved revision: | 98 | ||||||||
Merged at revision: | 92 | ||||||||
Proposed branch: | lp:~nataliabidart/ubuntuone-control-panel/tweak-overview | ||||||||
Merge into: | lp:ubuntuone-control-panel | ||||||||
Diff against target: |
867 lines (+392/-337) 4 files modified
data/management.ui (+85/-108) data/overview.ui (+292/-225) ubuntuone/controlpanel/gtk/gui.py (+5/-2) ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+10/-2) |
||||||||
To merge this branch: | bzr merge lp:~nataliabidart/ubuntuone-control-panel/tweak-overview | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Albisetti (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+52124@code.launchpad.net |
Description of the change
Screenshot for overview screen is: http://
To post a comment you must log in.
- 95. By Natalia Bidart
-
Proper logo to music streaming.
- 96. By Natalia Bidart
-
Using latest icons.
- 97. By Natalia Bidart
-
Merged trunk in.
Revision history for this message
Martin Albisetti (beuno) wrote : | # |
815 + LEARN_MORE_LINK = 'http://
I'd change that to https:/
Other than that, looks great!
review:
Approve
- 98. By Natalia Bidart
-
s/http/https
Revision history for this message
Natalia Bidart (nataliabidart) wrote : | # |
Fixed!
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'data/banner.png' | |||
2 | 0 | Binary files data/banner.png 2011-02-23 21:23:30 +0000 and data/banner.png 1970-01-01 00:00:00 +0000 differ | 0 | Binary files data/banner.png 2011-02-23 21:23:30 +0000 and data/banner.png 1970-01-01 00:00:00 +0000 differ |
3 | === modified file 'data/contacts.png' | |||
4 | 1 | Binary files data/contacts.png 2011-02-11 16:57:09 +0000 and data/contacts.png 2011-03-04 13:50:22 +0000 differ | 1 | Binary files data/contacts.png 2011-02-11 16:57:09 +0000 and data/contacts.png 2011-03-04 13:50:22 +0000 differ |
5 | === modified file 'data/files.png' | |||
6 | 2 | Binary files data/files.png 2011-02-11 16:57:09 +0000 and data/files.png 2011-03-04 13:50:22 +0000 differ | 2 | Binary files data/files.png 2011-02-11 16:57:09 +0000 and data/files.png 2011-03-04 13:50:22 +0000 differ |
7 | === modified file 'data/management.ui' | |||
8 | --- data/management.ui 2011-02-22 19:28:14 +0000 | |||
9 | +++ data/management.ui 2011-03-04 13:50:22 +0000 | |||
10 | @@ -50,138 +50,104 @@ | |||
11 | 50 | </packing> | 50 | </packing> |
12 | 51 | </child> | 51 | </child> |
13 | 52 | <child> | 52 | <child> |
15 | 53 | <object class="GtkVBox" id="vbox1"> | 53 | <object class="GtkHBox" id="hbox2"> |
16 | 54 | <property name="visible">True</property> | 54 | <property name="visible">True</property> |
17 | 55 | <property name="can_focus">False</property> | 55 | <property name="can_focus">False</property> |
18 | 56 | <child> | 56 | <child> |
22 | 57 | <object class="GtkHBox" id="hbox2"> | 57 | <object class="GtkHSeparator" id="hseparator1"> |
23 | 58 | <property name="visible">True</property> | 58 | <property name="visible">True</property> |
24 | 59 | <property name="can_focus">False</property> | 59 | <property name="can_focus">False</property> |
25 | 60 | </object> | ||
26 | 61 | <packing> | ||
27 | 62 | <property name="expand">True</property> | ||
28 | 63 | <property name="fill">True</property> | ||
29 | 64 | <property name="position">0</property> | ||
30 | 65 | </packing> | ||
31 | 66 | </child> | ||
32 | 67 | <child> | ||
33 | 68 | <object class="GtkHButtonBox" id="hbuttonbox1"> | ||
34 | 69 | <property name="visible">True</property> | ||
35 | 70 | <property name="can_focus">False</property> | ||
36 | 71 | <property name="layout_style">center</property> | ||
37 | 60 | <child> | 72 | <child> |
39 | 61 | <object class="GtkHSeparator" id="hseparator1"> | 73 | <object class="GtkRadioButton" id="dashboard_button"> |
40 | 74 | <property name="label" translatable="yes">Account</property> | ||
41 | 62 | <property name="visible">True</property> | 75 | <property name="visible">True</property> |
43 | 63 | <property name="can_focus">False</property> | 76 | <property name="can_focus">True</property> |
44 | 77 | <property name="receives_default">False</property> | ||
45 | 78 | <property name="use_action_appearance">False</property> | ||
46 | 79 | <property name="active">True</property> | ||
47 | 80 | <property name="draw_indicator">False</property> | ||
48 | 64 | </object> | 81 | </object> |
49 | 65 | <packing> | 82 | <packing> |
52 | 66 | <property name="expand">True</property> | 83 | <property name="expand">False</property> |
53 | 67 | <property name="fill">True</property> | 84 | <property name="fill">False</property> |
54 | 68 | <property name="position">0</property> | 85 | <property name="position">0</property> |
55 | 69 | </packing> | 86 | </packing> |
56 | 70 | </child> | 87 | </child> |
57 | 71 | <child> | 88 | <child> |
59 | 72 | <object class="GtkHButtonBox" id="hbuttonbox1"> | 89 | <object class="GtkRadioButton" id="volumes_button"> |
60 | 90 | <property name="label" translatable="yes">Cloud Folders</property> | ||
61 | 73 | <property name="visible">True</property> | 91 | <property name="visible">True</property> |
143 | 74 | <property name="can_focus">False</property> | 92 | <property name="can_focus">True</property> |
144 | 75 | <property name="layout_style">center</property> | 93 | <property name="receives_default">False</property> |
145 | 76 | <child> | 94 | <property name="use_action_appearance">False</property> |
146 | 77 | <object class="GtkRadioButton" id="dashboard_button"> | 95 | <property name="draw_indicator">False</property> |
147 | 78 | <property name="label" translatable="yes">Account</property> | 96 | <property name="group">dashboard_button</property> |
67 | 79 | <property name="visible">True</property> | ||
68 | 80 | <property name="can_focus">True</property> | ||
69 | 81 | <property name="receives_default">False</property> | ||
70 | 82 | <property name="use_action_appearance">False</property> | ||
71 | 83 | <property name="active">True</property> | ||
72 | 84 | <property name="draw_indicator">False</property> | ||
73 | 85 | </object> | ||
74 | 86 | <packing> | ||
75 | 87 | <property name="expand">False</property> | ||
76 | 88 | <property name="fill">False</property> | ||
77 | 89 | <property name="position">0</property> | ||
78 | 90 | </packing> | ||
79 | 91 | </child> | ||
80 | 92 | <child> | ||
81 | 93 | <object class="GtkRadioButton" id="volumes_button"> | ||
82 | 94 | <property name="label" translatable="yes">Cloud Folders</property> | ||
83 | 95 | <property name="visible">True</property> | ||
84 | 96 | <property name="can_focus">True</property> | ||
85 | 97 | <property name="receives_default">False</property> | ||
86 | 98 | <property name="use_action_appearance">False</property> | ||
87 | 99 | <property name="draw_indicator">False</property> | ||
88 | 100 | <property name="group">dashboard_button</property> | ||
89 | 101 | </object> | ||
90 | 102 | <packing> | ||
91 | 103 | <property name="expand">False</property> | ||
92 | 104 | <property name="fill">False</property> | ||
93 | 105 | <property name="position">1</property> | ||
94 | 106 | </packing> | ||
95 | 107 | </child> | ||
96 | 108 | <child> | ||
97 | 109 | <object class="GtkRadioButton" id="shares_button"> | ||
98 | 110 | <property name="label" translatable="yes">Shares</property> | ||
99 | 111 | <property name="can_focus">True</property> | ||
100 | 112 | <property name="receives_default">False</property> | ||
101 | 113 | <property name="use_action_appearance">False</property> | ||
102 | 114 | <property name="draw_indicator">False</property> | ||
103 | 115 | <property name="group">dashboard_button</property> | ||
104 | 116 | </object> | ||
105 | 117 | <packing> | ||
106 | 118 | <property name="expand">False</property> | ||
107 | 119 | <property name="fill">False</property> | ||
108 | 120 | <property name="position">2</property> | ||
109 | 121 | </packing> | ||
110 | 122 | </child> | ||
111 | 123 | <child> | ||
112 | 124 | <object class="GtkRadioButton" id="devices_button"> | ||
113 | 125 | <property name="label" translatable="yes">Devices</property> | ||
114 | 126 | <property name="visible">True</property> | ||
115 | 127 | <property name="can_focus">True</property> | ||
116 | 128 | <property name="receives_default">False</property> | ||
117 | 129 | <property name="use_action_appearance">False</property> | ||
118 | 130 | <property name="draw_indicator">False</property> | ||
119 | 131 | <property name="group">dashboard_button</property> | ||
120 | 132 | </object> | ||
121 | 133 | <packing> | ||
122 | 134 | <property name="expand">False</property> | ||
123 | 135 | <property name="fill">False</property> | ||
124 | 136 | <property name="position">3</property> | ||
125 | 137 | </packing> | ||
126 | 138 | </child> | ||
127 | 139 | <child> | ||
128 | 140 | <object class="GtkRadioButton" id="services_button"> | ||
129 | 141 | <property name="label" translatable="yes">Services</property> | ||
130 | 142 | <property name="visible">True</property> | ||
131 | 143 | <property name="can_focus">True</property> | ||
132 | 144 | <property name="receives_default">False</property> | ||
133 | 145 | <property name="use_action_appearance">False</property> | ||
134 | 146 | <property name="draw_indicator">False</property> | ||
135 | 147 | <property name="group">dashboard_button</property> | ||
136 | 148 | </object> | ||
137 | 149 | <packing> | ||
138 | 150 | <property name="expand">False</property> | ||
139 | 151 | <property name="fill">False</property> | ||
140 | 152 | <property name="position">4</property> | ||
141 | 153 | </packing> | ||
142 | 154 | </child> | ||
148 | 155 | </object> | 97 | </object> |
149 | 156 | <packing> | 98 | <packing> |
150 | 157 | <property name="expand">False</property> | 99 | <property name="expand">False</property> |
152 | 158 | <property name="fill">True</property> | 100 | <property name="fill">False</property> |
153 | 159 | <property name="position">1</property> | 101 | <property name="position">1</property> |
154 | 160 | </packing> | 102 | </packing> |
155 | 161 | </child> | 103 | </child> |
156 | 162 | <child> | 104 | <child> |
160 | 163 | <object class="GtkHSeparator" id="hseparator2"> | 105 | <object class="GtkRadioButton" id="shares_button"> |
161 | 164 | <property name="visible">True</property> | 106 | <property name="label" translatable="yes">Shares</property> |
162 | 165 | <property name="can_focus">False</property> | 107 | <property name="can_focus">True</property> |
163 | 108 | <property name="receives_default">False</property> | ||
164 | 109 | <property name="use_action_appearance">False</property> | ||
165 | 110 | <property name="draw_indicator">False</property> | ||
166 | 111 | <property name="group">dashboard_button</property> | ||
167 | 166 | </object> | 112 | </object> |
168 | 167 | <packing> | 113 | <packing> |
171 | 168 | <property name="expand">True</property> | 114 | <property name="expand">False</property> |
172 | 169 | <property name="fill">True</property> | 115 | <property name="fill">False</property> |
173 | 170 | <property name="position">2</property> | 116 | <property name="position">2</property> |
174 | 171 | </packing> | 117 | </packing> |
175 | 172 | </child> | 118 | </child> |
188 | 173 | </object> | 119 | <child> |
189 | 174 | <packing> | 120 | <object class="GtkRadioButton" id="devices_button"> |
190 | 175 | <property name="expand">False</property> | 121 | <property name="label" translatable="yes">Devices</property> |
191 | 176 | <property name="fill">True</property> | 122 | <property name="visible">True</property> |
192 | 177 | <property name="position">0</property> | 123 | <property name="can_focus">True</property> |
193 | 178 | </packing> | 124 | <property name="receives_default">False</property> |
194 | 179 | </child> | 125 | <property name="use_action_appearance">False</property> |
195 | 180 | <child> | 126 | <property name="draw_indicator">False</property> |
196 | 181 | <object class="GtkImage" id="image1"> | 127 | <property name="group">dashboard_button</property> |
197 | 182 | <property name="visible">True</property> | 128 | </object> |
198 | 183 | <property name="can_focus">False</property> | 129 | <packing> |
199 | 184 | <property name="pixbuf">banner.png</property> | 130 | <property name="expand">False</property> |
200 | 131 | <property name="fill">False</property> | ||
201 | 132 | <property name="position">3</property> | ||
202 | 133 | </packing> | ||
203 | 134 | </child> | ||
204 | 135 | <child> | ||
205 | 136 | <object class="GtkRadioButton" id="services_button"> | ||
206 | 137 | <property name="label" translatable="yes">Services</property> | ||
207 | 138 | <property name="visible">True</property> | ||
208 | 139 | <property name="can_focus">True</property> | ||
209 | 140 | <property name="receives_default">False</property> | ||
210 | 141 | <property name="use_action_appearance">False</property> | ||
211 | 142 | <property name="draw_indicator">False</property> | ||
212 | 143 | <property name="group">dashboard_button</property> | ||
213 | 144 | </object> | ||
214 | 145 | <packing> | ||
215 | 146 | <property name="expand">False</property> | ||
216 | 147 | <property name="fill">False</property> | ||
217 | 148 | <property name="position">4</property> | ||
218 | 149 | </packing> | ||
219 | 150 | </child> | ||
220 | 185 | </object> | 151 | </object> |
221 | 186 | <packing> | 152 | <packing> |
222 | 187 | <property name="expand">False</property> | 153 | <property name="expand">False</property> |
223 | @@ -189,6 +155,17 @@ | |||
224 | 189 | <property name="position">1</property> | 155 | <property name="position">1</property> |
225 | 190 | </packing> | 156 | </packing> |
226 | 191 | </child> | 157 | </child> |
227 | 158 | <child> | ||
228 | 159 | <object class="GtkHSeparator" id="hseparator2"> | ||
229 | 160 | <property name="visible">True</property> | ||
230 | 161 | <property name="can_focus">False</property> | ||
231 | 162 | </object> | ||
232 | 163 | <packing> | ||
233 | 164 | <property name="expand">True</property> | ||
234 | 165 | <property name="fill">True</property> | ||
235 | 166 | <property name="position">2</property> | ||
236 | 167 | </packing> | ||
237 | 168 | </child> | ||
238 | 192 | </object> | 169 | </object> |
239 | 193 | <packing> | 170 | <packing> |
240 | 194 | <property name="expand">False</property> | 171 | <property name="expand">False</property> |
241 | 195 | 172 | ||
242 | === renamed file 'data/music.png' => 'data/music-store.png' | |||
243 | 196 | Binary files data/music.png 2011-02-11 16:57:09 +0000 and data/music-store.png 2011-03-04 13:50:22 +0000 differ | 173 | Binary files data/music.png 2011-02-11 16:57:09 +0000 and data/music-store.png 2011-03-04 13:50:22 +0000 differ |
244 | === added file 'data/music-stream.png' | |||
245 | 197 | Binary files data/music-stream.png 1970-01-01 00:00:00 +0000 and data/music-stream.png 2011-03-04 13:50:22 +0000 differ | 174 | Binary files data/music-stream.png 1970-01-01 00:00:00 +0000 and data/music-stream.png 2011-03-04 13:50:22 +0000 differ |
246 | === modified file 'data/notes.png' | |||
247 | 198 | Binary files data/notes.png 2011-02-11 16:57:09 +0000 and data/notes.png 2011-03-04 13:50:22 +0000 differ | 175 | Binary files data/notes.png 2011-02-11 16:57:09 +0000 and data/notes.png 2011-03-04 13:50:22 +0000 differ |
248 | === modified file 'data/overview.png' | |||
249 | 199 | Binary files data/overview.png 2010-11-30 17:21:15 +0000 and data/overview.png 2011-03-04 13:50:22 +0000 differ | 176 | Binary files data/overview.png 2010-11-30 17:21:15 +0000 and data/overview.png 2011-03-04 13:50:22 +0000 differ |
250 | === modified file 'data/overview.ui' | |||
251 | --- data/overview.ui 2011-03-03 13:29:13 +0000 | |||
252 | +++ data/overview.ui 2011-03-04 13:50:22 +0000 | |||
253 | @@ -6,7 +6,7 @@ | |||
254 | 6 | <property name="visible">True</property> | 6 | <property name="visible">True</property> |
255 | 7 | <property name="can_focus">False</property> | 7 | <property name="can_focus">False</property> |
256 | 8 | <child> | 8 | <child> |
258 | 9 | <object class="GtkEventBox" id="header"> | 9 | <object class="GtkEventBox" id="banner"> |
259 | 10 | <property name="visible">True</property> | 10 | <property name="visible">True</property> |
260 | 11 | <property name="can_focus">False</property> | 11 | <property name="can_focus">False</property> |
261 | 12 | <child> | 12 | <child> |
262 | @@ -35,249 +35,316 @@ | |||
263 | 35 | <property name="can_focus">False</property> | 35 | <property name="can_focus">False</property> |
264 | 36 | <property name="shadow_type">none</property> | 36 | <property name="shadow_type">none</property> |
265 | 37 | <child> | 37 | <child> |
267 | 38 | <object class="GtkHBox" id="hbox1"> | 38 | <object class="GtkVBox" id="vbox1"> |
268 | 39 | <property name="visible">True</property> | 39 | <property name="visible">True</property> |
269 | 40 | <property name="can_focus">False</property> | 40 | <property name="can_focus">False</property> |
386 | 41 | <property name="border_width">20</property> | 41 | <child> |
387 | 42 | <property name="spacing">5</property> | 42 | <object class="GtkLabel" id="label7"> |
388 | 43 | <child> | 43 | <property name="visible">True</property> |
389 | 44 | <object class="GtkTable" id="table1"> | 44 | <property name="can_focus">False</property> |
390 | 45 | <property name="visible">True</property> | 45 | <property name="label" translatable="yes"><span font_size="xx-large" foreground="#4d4d4d">The Power of Your Personal Cloud</span></property> |
391 | 46 | <property name="can_focus">False</property> | 46 | <property name="use_markup">True</property> |
392 | 47 | <property name="n_rows">4</property> | 47 | </object> |
393 | 48 | <property name="n_columns">2</property> | 48 | <packing> |
394 | 49 | <property name="column_spacing">10</property> | 49 | <property name="expand">False</property> |
395 | 50 | <property name="row_spacing">10</property> | 50 | <property name="fill">True</property> |
396 | 51 | <child> | 51 | <property name="padding">12</property> |
397 | 52 | <object class="GtkImage" id="image1"> | 52 | <property name="position">0</property> |
398 | 53 | <property name="visible">True</property> | 53 | </packing> |
399 | 54 | <property name="can_focus">False</property> | 54 | </child> |
400 | 55 | <property name="pixbuf">files.png</property> | 55 | <child> |
401 | 56 | </object> | 56 | <object class="GtkHBox" id="hbox1"> |
402 | 57 | <packing> | 57 | <property name="visible">True</property> |
403 | 58 | <property name="x_options">GTK_FILL</property> | 58 | <property name="can_focus">False</property> |
404 | 59 | <property name="y_options">GTK_FILL</property> | 59 | <property name="border_width">20</property> |
405 | 60 | </packing> | 60 | <property name="spacing">5</property> |
406 | 61 | </child> | 61 | <child> |
407 | 62 | <child> | 62 | <object class="GtkTable" id="table1"> |
408 | 63 | <object class="GtkImage" id="image2"> | 63 | <property name="visible">True</property> |
409 | 64 | <property name="visible">True</property> | 64 | <property name="can_focus">False</property> |
410 | 65 | <property name="can_focus">False</property> | 65 | <property name="n_rows">4</property> |
411 | 66 | <property name="pixbuf">contacts.png</property> | 66 | <property name="n_columns">2</property> |
412 | 67 | </object> | 67 | <property name="column_spacing">10</property> |
413 | 68 | <packing> | 68 | <child> |
414 | 69 | <property name="top_attach">1</property> | 69 | <object class="GtkImage" id="image1"> |
415 | 70 | <property name="bottom_attach">2</property> | 70 | <property name="visible">True</property> |
416 | 71 | <property name="x_options">GTK_FILL</property> | 71 | <property name="can_focus">False</property> |
417 | 72 | <property name="y_options">GTK_FILL</property> | 72 | <property name="pixbuf">files.png</property> |
418 | 73 | </packing> | 73 | </object> |
419 | 74 | </child> | 74 | <packing> |
420 | 75 | <child> | 75 | <property name="x_options">GTK_FILL</property> |
421 | 76 | <object class="GtkImage" id="image3"> | 76 | <property name="y_options">GTK_FILL</property> |
422 | 77 | <property name="visible">True</property> | 77 | </packing> |
423 | 78 | <property name="can_focus">False</property> | 78 | </child> |
424 | 79 | <property name="pixbuf">music.png</property> | 79 | <child> |
425 | 80 | </object> | 80 | <object class="GtkImage" id="image2"> |
426 | 81 | <packing> | 81 | <property name="visible">True</property> |
427 | 82 | <property name="top_attach">2</property> | 82 | <property name="can_focus">False</property> |
428 | 83 | <property name="bottom_attach">3</property> | 83 | <property name="pixbuf">music-stream.png</property> |
429 | 84 | <property name="x_options">GTK_FILL</property> | 84 | </object> |
430 | 85 | <property name="y_options">GTK_FILL</property> | 85 | <packing> |
431 | 86 | </packing> | 86 | <property name="top_attach">1</property> |
432 | 87 | </child> | 87 | <property name="bottom_attach">2</property> |
433 | 88 | <child> | 88 | <property name="x_options">GTK_FILL</property> |
434 | 89 | <object class="GtkImage" id="image4"> | 89 | <property name="y_options">GTK_FILL</property> |
435 | 90 | <property name="visible">True</property> | 90 | </packing> |
436 | 91 | <property name="can_focus">False</property> | 91 | </child> |
437 | 92 | <property name="pixbuf">notes.png</property> | 92 | <child> |
438 | 93 | </object> | 93 | <object class="GtkImage" id="image3"> |
439 | 94 | <packing> | 94 | <property name="visible">True</property> |
440 | 95 | <property name="top_attach">3</property> | 95 | <property name="can_focus">False</property> |
441 | 96 | <property name="bottom_attach">4</property> | 96 | <property name="pixbuf">contacts.png</property> |
442 | 97 | <property name="x_options">GTK_FILL</property> | 97 | </object> |
443 | 98 | <property name="y_options">GTK_FILL</property> | 98 | <packing> |
444 | 99 | </packing> | 99 | <property name="top_attach">2</property> |
445 | 100 | </child> | 100 | <property name="bottom_attach">3</property> |
446 | 101 | <child> | 101 | <property name="x_options">GTK_FILL</property> |
447 | 102 | <object class="GtkLabel" id="label3"> | 102 | <property name="y_options">GTK_FILL</property> |
448 | 103 | <property name="visible">True</property> | 103 | </packing> |
449 | 104 | <property name="can_focus">False</property> | 104 | </child> |
450 | 105 | <property name="xalign">0</property> | 105 | <child> |
451 | 106 | <property name="label" translatable="yes">Files Anywhere | 106 | <object class="GtkImage" id="image4"> |
452 | 107 | <span foreground="#909090">Backup and access your files from Windows, Ubuntu, or Mobile</span></property> | 107 | <property name="visible">True</property> |
453 | 108 | <property name="use_markup">True</property> | 108 | <property name="can_focus">False</property> |
454 | 109 | <property name="wrap">True</property> | 109 | <property name="pixbuf">notes.png</property> |
455 | 110 | </object> | 110 | </object> |
456 | 111 | <packing> | 111 | <packing> |
457 | 112 | <property name="left_attach">1</property> | 112 | <property name="top_attach">3</property> |
458 | 113 | <property name="right_attach">2</property> | 113 | <property name="bottom_attach">4</property> |
459 | 114 | </packing> | 114 | <property name="x_options">GTK_FILL</property> |
460 | 115 | </child> | 115 | <property name="y_options">GTK_FILL</property> |
461 | 116 | <child> | 116 | </packing> |
462 | 117 | <object class="GtkLabel" id="label4"> | 117 | </child> |
463 | 118 | <property name="visible">True</property> | 118 | <child> |
464 | 119 | <property name="can_focus">False</property> | 119 | <object class="GtkLabel" id="label3"> |
465 | 120 | <property name="xalign">0</property> | 120 | <property name="visible">True</property> |
466 | 121 | <property name="label" translatable="yes">Keep connected | 121 | <property name="can_focus">False</property> |
467 | 122 | <span foreground="#909090">Unify your contacts accress Desktop, Mobile and Web</span></property> | 122 | <property name="xalign">0</property> |
468 | 123 | <property name="use_markup">True</property> | 123 | <property name="label" translatable="yes">Files Anywhere |
469 | 124 | <property name="wrap">True</property> | 124 | <span foreground="#909090">Backup and access your files from Ubuntu, Windows or Mobile</span></property> |
470 | 125 | </object> | 125 | <property name="use_markup">True</property> |
471 | 126 | <packing> | 126 | <property name="wrap">True</property> |
472 | 127 | <property name="left_attach">1</property> | 127 | </object> |
473 | 128 | <property name="right_attach">2</property> | 128 | <packing> |
474 | 129 | <property name="top_attach">1</property> | 129 | <property name="left_attach">1</property> |
475 | 130 | <property name="bottom_attach">2</property> | 130 | <property name="right_attach">2</property> |
476 | 131 | </packing> | 131 | </packing> |
477 | 132 | </child> | 132 | </child> |
478 | 133 | <child> | 133 | <child> |
479 | 134 | <object class="GtkLabel" id="label5"> | 134 | <object class="GtkLabel" id="label4"> |
480 | 135 | <property name="visible">True</property> | 135 | <property name="visible">True</property> |
481 | 136 | <property name="can_focus">False</property> | 136 | <property name="can_focus">False</property> |
482 | 137 | <property name="xalign">0</property> | 137 | <property name="xalign">0</property> |
483 | 138 | <property name="label" translatable="yes">Rock Out | 138 | <property name="label" translatable="yes">Keep Connected |
484 | 139 | <span foreground="#909090">Your library at your fingertips with Android, iPhone, and AirPlay | 139 | <span foreground="#909090">Unify your contacts across Desktop, Mobile and Web</span></property> |
485 | 140 | Plus the Ubuntu One Music store to grow your collection</span></property> | 140 | <property name="use_markup">True</property> |
486 | 141 | <property name="use_markup">True</property> | 141 | <property name="wrap">True</property> |
487 | 142 | <property name="wrap">True</property> | 142 | </object> |
488 | 143 | </object> | 143 | <packing> |
489 | 144 | <packing> | 144 | <property name="left_attach">1</property> |
490 | 145 | <property name="left_attach">1</property> | 145 | <property name="right_attach">2</property> |
491 | 146 | <property name="right_attach">2</property> | 146 | <property name="top_attach">2</property> |
492 | 147 | <property name="top_attach">2</property> | 147 | <property name="bottom_attach">3</property> |
493 | 148 | <property name="bottom_attach">3</property> | 148 | </packing> |
494 | 149 | </packing> | 149 | </child> |
495 | 150 | </child> | 150 | <child> |
496 | 151 | <child> | 151 | <object class="GtkLabel" id="label5"> |
497 | 152 | <object class="GtkLabel" id="label6"> | 152 | <property name="visible">True</property> |
498 | 153 | <property name="visible">True</property> | 153 | <property name="can_focus">False</property> |
499 | 154 | <property name="can_focus">False</property> | 154 | <property name="xalign">0</property> |
500 | 155 | <property name="xalign">0</property> | 155 | <property name="label" translatable="yes">Rock Out |
501 | 156 | <property name="label" translatable="yes">Stay Productive | 156 | <span foreground="#909090">Your entire collection follows you around with music streaming to Android and iPhone</span></property> |
502 | 157 | <property name="use_markup">True</property> | ||
503 | 158 | <property name="wrap">True</property> | ||
504 | 159 | </object> | ||
505 | 160 | <packing> | ||
506 | 161 | <property name="left_attach">1</property> | ||
507 | 162 | <property name="right_attach">2</property> | ||
508 | 163 | <property name="top_attach">1</property> | ||
509 | 164 | <property name="bottom_attach">2</property> | ||
510 | 165 | </packing> | ||
511 | 166 | </child> | ||
512 | 167 | <child> | ||
513 | 168 | <object class="GtkLabel" id="label6"> | ||
514 | 169 | <property name="visible">True</property> | ||
515 | 170 | <property name="can_focus">False</property> | ||
516 | 171 | <property name="xalign">0</property> | ||
517 | 172 | <property name="label" translatable="yes">Stay Productive | ||
518 | 157 | <span foreground="#909090">Keep your Firefox bookmarks and Tomboy notes synced</span></property> | 173 | <span foreground="#909090">Keep your Firefox bookmarks and Tomboy notes synced</span></property> |
521 | 158 | <property name="use_markup">True</property> | 174 | <property name="use_markup">True</property> |
522 | 159 | <property name="wrap">True</property> | 175 | <property name="wrap">True</property> |
523 | 176 | </object> | ||
524 | 177 | <packing> | ||
525 | 178 | <property name="left_attach">1</property> | ||
526 | 179 | <property name="right_attach">2</property> | ||
527 | 180 | <property name="top_attach">3</property> | ||
528 | 181 | <property name="bottom_attach">4</property> | ||
529 | 182 | </packing> | ||
530 | 183 | </child> | ||
531 | 160 | </object> | 184 | </object> |
532 | 161 | <packing> | 185 | <packing> |
537 | 162 | <property name="left_attach">1</property> | 186 | <property name="expand">True</property> |
538 | 163 | <property name="right_attach">2</property> | 187 | <property name="fill">True</property> |
539 | 164 | <property name="top_attach">3</property> | 188 | <property name="position">0</property> |
536 | 165 | <property name="bottom_attach">4</property> | ||
540 | 166 | </packing> | 189 | </packing> |
541 | 167 | </child> | 190 | </child> |
542 | 168 | </object> | ||
543 | 169 | <packing> | ||
544 | 170 | <property name="expand">True</property> | ||
545 | 171 | <property name="fill">True</property> | ||
546 | 172 | <property name="position">0</property> | ||
547 | 173 | </packing> | ||
548 | 174 | </child> | ||
549 | 175 | <child> | ||
550 | 176 | <object class="GtkVBox" id="vbox1"> | ||
551 | 177 | <property name="visible">True</property> | ||
552 | 178 | <property name="can_focus">False</property> | ||
553 | 179 | <child> | 191 | <child> |
555 | 180 | <object class="GtkLabel" id="warning_label"> | 192 | <object class="GtkVBox" id="vbox2"> |
556 | 181 | <property name="visible">True</property> | 193 | <property name="visible">True</property> |
557 | 182 | <property name="can_focus">False</property> | 194 | <property name="can_focus">False</property> |
562 | 183 | <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property> | 195 | <child> |
563 | 184 | <property name="use_markup">True</property> | 196 | <object class="GtkLabel" id="warning_label"> |
564 | 185 | <property name="wrap">True</property> | 197 | <property name="visible">True</property> |
565 | 186 | <property name="width_chars">30</property> | 198 | <property name="can_focus">False</property> |
566 | 199 | <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property> | ||
567 | 200 | <property name="wrap">True</property> | ||
568 | 201 | </object> | ||
569 | 202 | <packing> | ||
570 | 203 | <property name="expand">False</property> | ||
571 | 204 | <property name="fill">True</property> | ||
572 | 205 | <property name="position">0</property> | ||
573 | 206 | </packing> | ||
574 | 207 | </child> | ||
575 | 208 | <child> | ||
576 | 209 | <object class="GtkAlignment" id="alignment2"> | ||
577 | 210 | <property name="visible">True</property> | ||
578 | 211 | <property name="can_focus">False</property> | ||
579 | 212 | <property name="xscale">0</property> | ||
580 | 213 | <property name="yscale">0</property> | ||
581 | 214 | <child> | ||
582 | 215 | <object class="GtkVBox" id="vbox3"> | ||
583 | 216 | <property name="visible">True</property> | ||
584 | 217 | <property name="can_focus">False</property> | ||
585 | 218 | <property name="spacing">10</property> | ||
586 | 219 | <child> | ||
587 | 220 | <object class="GtkButton" id="learn_more_button"> | ||
588 | 221 | <property name="visible">True</property> | ||
589 | 222 | <property name="can_focus">True</property> | ||
590 | 223 | <property name="receives_default">True</property> | ||
591 | 224 | <property name="use_action_appearance">False</property> | ||
592 | 225 | <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/> | ||
593 | 226 | <child> | ||
594 | 227 | <object class="GtkVBox" id="vbox5"> | ||
595 | 228 | <property name="visible">True</property> | ||
596 | 229 | <property name="can_focus">False</property> | ||
597 | 230 | <child> | ||
598 | 231 | <object class="GtkImage" id="image5"> | ||
599 | 232 | <property name="visible">True</property> | ||
600 | 233 | <property name="can_focus">False</property> | ||
601 | 234 | <property name="pixel_size">45</property> | ||
602 | 235 | <property name="icon_name">ubuntuone</property> | ||
603 | 236 | </object> | ||
604 | 237 | <packing> | ||
605 | 238 | <property name="expand">True</property> | ||
606 | 239 | <property name="fill">True</property> | ||
607 | 240 | <property name="position">0</property> | ||
608 | 241 | </packing> | ||
609 | 242 | </child> | ||
610 | 243 | <child> | ||
611 | 244 | <object class="GtkLabel" id="label8"> | ||
612 | 245 | <property name="visible">True</property> | ||
613 | 246 | <property name="can_focus">False</property> | ||
614 | 247 | <property name="label" translatable="yes"><span foreground="#909090">Learn More</span></property> | ||
615 | 248 | <property name="use_markup">True</property> | ||
616 | 249 | </object> | ||
617 | 250 | <packing> | ||
618 | 251 | <property name="expand">True</property> | ||
619 | 252 | <property name="fill">True</property> | ||
620 | 253 | <property name="position">1</property> | ||
621 | 254 | </packing> | ||
622 | 255 | </child> | ||
623 | 256 | </object> | ||
624 | 257 | </child> | ||
625 | 258 | </object> | ||
626 | 259 | <packing> | ||
627 | 260 | <property name="expand">True</property> | ||
628 | 261 | <property name="fill">True</property> | ||
629 | 262 | <property name="position">0</property> | ||
630 | 263 | </packing> | ||
631 | 264 | </child> | ||
632 | 265 | <child> | ||
633 | 266 | <object class="GtkButton" id="join_now_button"> | ||
634 | 267 | <property name="visible">True</property> | ||
635 | 268 | <property name="can_focus">True</property> | ||
636 | 269 | <property name="can_default">True</property> | ||
637 | 270 | <property name="receives_default">True</property> | ||
638 | 271 | <property name="use_action_appearance">False</property> | ||
639 | 272 | <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/> | ||
640 | 273 | <child> | ||
641 | 274 | <object class="GtkVBox" id="vbox4"> | ||
642 | 275 | <property name="visible">True</property> | ||
643 | 276 | <property name="can_focus">False</property> | ||
644 | 277 | <property name="spacing">5</property> | ||
645 | 278 | <child> | ||
646 | 279 | <object class="GtkLabel" id="label1"> | ||
647 | 280 | <property name="visible">True</property> | ||
648 | 281 | <property name="can_focus">False</property> | ||
649 | 282 | <property name="label" translatable="yes"><span font_size="xx-large" foreground="#4d4d4d">Join now</span></property> | ||
650 | 283 | <property name="use_markup">True</property> | ||
651 | 284 | </object> | ||
652 | 285 | <packing> | ||
653 | 286 | <property name="expand">True</property> | ||
654 | 287 | <property name="fill">True</property> | ||
655 | 288 | <property name="position">0</property> | ||
656 | 289 | </packing> | ||
657 | 290 | </child> | ||
658 | 291 | <child> | ||
659 | 292 | <object class="GtkLabel" id="label2"> | ||
660 | 293 | <property name="visible">True</property> | ||
661 | 294 | <property name="can_focus">False</property> | ||
662 | 295 | <property name="label" translatable="yes"><span foreground="#909090">2GB of free storage</span></property> | ||
663 | 296 | <property name="use_markup">True</property> | ||
664 | 297 | </object> | ||
665 | 298 | <packing> | ||
666 | 299 | <property name="expand">True</property> | ||
667 | 300 | <property name="fill">True</property> | ||
668 | 301 | <property name="position">1</property> | ||
669 | 302 | </packing> | ||
670 | 303 | </child> | ||
671 | 304 | </object> | ||
672 | 305 | </child> | ||
673 | 306 | </object> | ||
674 | 307 | <packing> | ||
675 | 308 | <property name="expand">False</property> | ||
676 | 309 | <property name="fill">True</property> | ||
677 | 310 | <property name="position">1</property> | ||
678 | 311 | </packing> | ||
679 | 312 | </child> | ||
680 | 313 | <child> | ||
681 | 314 | <object class="GtkLinkButton" id="connect_button"> | ||
682 | 315 | <property name="label" translatable="yes">I already have an account!</property> | ||
683 | 316 | <property name="visible">True</property> | ||
684 | 317 | <property name="can_focus">True</property> | ||
685 | 318 | <property name="receives_default">True</property> | ||
686 | 319 | <property name="use_action_appearance">False</property> | ||
687 | 320 | <property name="relief">none</property> | ||
688 | 321 | <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/> | ||
689 | 322 | </object> | ||
690 | 323 | <packing> | ||
691 | 324 | <property name="expand">False</property> | ||
692 | 325 | <property name="fill">False</property> | ||
693 | 326 | <property name="position">2</property> | ||
694 | 327 | </packing> | ||
695 | 328 | </child> | ||
696 | 329 | </object> | ||
697 | 330 | </child> | ||
698 | 331 | </object> | ||
699 | 332 | <packing> | ||
700 | 333 | <property name="expand">True</property> | ||
701 | 334 | <property name="fill">True</property> | ||
702 | 335 | <property name="position">1</property> | ||
703 | 336 | </packing> | ||
704 | 337 | </child> | ||
705 | 187 | </object> | 338 | </object> |
706 | 188 | <packing> | 339 | <packing> |
707 | 189 | <property name="expand">False</property> | 340 | <property name="expand">False</property> |
708 | 190 | <property name="fill">True</property> | 341 | <property name="fill">True</property> |
709 | 191 | <property name="position">0</property> | ||
710 | 192 | </packing> | ||
711 | 193 | </child> | ||
712 | 194 | <child> | ||
713 | 195 | <object class="GtkAlignment" id="alignment2"> | ||
714 | 196 | <property name="visible">True</property> | ||
715 | 197 | <property name="can_focus">False</property> | ||
716 | 198 | <property name="xscale">0</property> | ||
717 | 199 | <property name="yscale">0</property> | ||
718 | 200 | <child> | ||
719 | 201 | <object class="GtkVBox" id="vbox2"> | ||
720 | 202 | <property name="visible">True</property> | ||
721 | 203 | <property name="can_focus">False</property> | ||
722 | 204 | <property name="spacing">10</property> | ||
723 | 205 | <child> | ||
724 | 206 | <object class="GtkButton" id="join_now_button"> | ||
725 | 207 | <property name="visible">True</property> | ||
726 | 208 | <property name="can_focus">True</property> | ||
727 | 209 | <property name="can_default">True</property> | ||
728 | 210 | <property name="receives_default">True</property> | ||
729 | 211 | <property name="use_action_appearance">False</property> | ||
730 | 212 | <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/> | ||
731 | 213 | <child> | ||
732 | 214 | <object class="GtkVBox" id="vbox3"> | ||
733 | 215 | <property name="visible">True</property> | ||
734 | 216 | <property name="can_focus">False</property> | ||
735 | 217 | <property name="spacing">5</property> | ||
736 | 218 | <child> | ||
737 | 219 | <object class="GtkLabel" id="label1"> | ||
738 | 220 | <property name="visible">True</property> | ||
739 | 221 | <property name="can_focus">False</property> | ||
740 | 222 | <property name="label" translatable="yes"><span font_size="xx-large">Join now</span></property> | ||
741 | 223 | <property name="use_markup">True</property> | ||
742 | 224 | </object> | ||
743 | 225 | <packing> | ||
744 | 226 | <property name="expand">True</property> | ||
745 | 227 | <property name="fill">True</property> | ||
746 | 228 | <property name="position">0</property> | ||
747 | 229 | </packing> | ||
748 | 230 | </child> | ||
749 | 231 | <child> | ||
750 | 232 | <object class="GtkLabel" id="label2"> | ||
751 | 233 | <property name="visible">True</property> | ||
752 | 234 | <property name="can_focus">False</property> | ||
753 | 235 | <property name="label" translatable="yes"><span foreground="#909090">2GB of free storage</span></property> | ||
754 | 236 | <property name="use_markup">True</property> | ||
755 | 237 | </object> | ||
756 | 238 | <packing> | ||
757 | 239 | <property name="expand">True</property> | ||
758 | 240 | <property name="fill">True</property> | ||
759 | 241 | <property name="position">1</property> | ||
760 | 242 | </packing> | ||
761 | 243 | </child> | ||
762 | 244 | </object> | ||
763 | 245 | </child> | ||
764 | 246 | </object> | ||
765 | 247 | <packing> | ||
766 | 248 | <property name="expand">False</property> | ||
767 | 249 | <property name="fill">True</property> | ||
768 | 250 | <property name="position">0</property> | ||
769 | 251 | </packing> | ||
770 | 252 | </child> | ||
771 | 253 | <child> | ||
772 | 254 | <object class="GtkLinkButton" id="connect_button"> | ||
773 | 255 | <property name="label" translatable="yes">I already have an account!</property> | ||
774 | 256 | <property name="visible">True</property> | ||
775 | 257 | <property name="can_focus">True</property> | ||
776 | 258 | <property name="receives_default">True</property> | ||
777 | 259 | <property name="use_action_appearance">False</property> | ||
778 | 260 | <property name="relief">none</property> | ||
779 | 261 | <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/> | ||
780 | 262 | </object> | ||
781 | 263 | <packing> | ||
782 | 264 | <property name="expand">False</property> | ||
783 | 265 | <property name="fill">False</property> | ||
784 | 266 | <property name="position">1</property> | ||
785 | 267 | </packing> | ||
786 | 268 | </child> | ||
787 | 269 | </object> | ||
788 | 270 | </child> | ||
789 | 271 | </object> | ||
790 | 272 | <packing> | ||
791 | 273 | <property name="expand">True</property> | ||
792 | 274 | <property name="fill">True</property> | ||
793 | 275 | <property name="position">1</property> | 342 | <property name="position">1</property> |
794 | 276 | </packing> | 343 | </packing> |
795 | 277 | </child> | 344 | </child> |
796 | 278 | </object> | 345 | </object> |
797 | 279 | <packing> | 346 | <packing> |
799 | 280 | <property name="expand">False</property> | 347 | <property name="expand">True</property> |
800 | 281 | <property name="fill">True</property> | 348 | <property name="fill">True</property> |
801 | 282 | <property name="position">1</property> | 349 | <property name="position">1</property> |
802 | 283 | </packing> | 350 | </packing> |
803 | 284 | 351 | ||
804 | === modified file 'ubuntuone/controlpanel/gtk/gui.py' | |||
805 | --- ubuntuone/controlpanel/gtk/gui.py 2011-03-03 18:14:30 +0000 | |||
806 | +++ ubuntuone/controlpanel/gtk/gui.py 2011-03-04 13:50:22 +0000 | |||
807 | @@ -210,10 +210,10 @@ | |||
808 | 210 | 210 | ||
809 | 211 | CREDENTIALS_ERROR = _('There was a problem while retrieving the ' | 211 | CREDENTIALS_ERROR = _('There was a problem while retrieving the ' |
810 | 212 | 'credentials.') | 212 | 'credentials.') |
811 | 213 | AUTHORIZATION_DENIED = _('The authentication was cancelled.') | ||
812 | 214 | NETWORK_OFFLINE = _('An internet connection is required to join or sign ' | 213 | NETWORK_OFFLINE = _('An internet connection is required to join or sign ' |
813 | 215 | 'in to %(app_name)s.') | 214 | 'in to %(app_name)s.') |
814 | 216 | CONNECT = _('Connect to Ubuntu One') | 215 | CONNECT = _('Connect to Ubuntu One') |
815 | 216 | LEARN_MORE_LINK = 'https://one.ubuntu.com/' | ||
816 | 217 | 217 | ||
817 | 218 | def __init__(self, main_window): | 218 | def __init__(self, main_window): |
818 | 219 | GreyableBin.__init__(self) | 219 | GreyableBin.__init__(self) |
819 | @@ -296,6 +296,10 @@ | |||
820 | 296 | self.set_property('greyed', True) | 296 | self.set_property('greyed', True) |
821 | 297 | self.warning_label.set_text('') | 297 | self.warning_label.set_text('') |
822 | 298 | 298 | ||
823 | 299 | def on_learn_more_button_clicked(self, *a, **kw): | ||
824 | 300 | """User wants to learn more.""" | ||
825 | 301 | uri_hook(self.learn_more_button, self.LEARN_MORE_LINK) | ||
826 | 302 | |||
827 | 299 | @filter_by_app_name | 303 | @filter_by_app_name |
828 | 300 | @log_call(logger.info, with_args=False) | 304 | @log_call(logger.info, with_args=False) |
829 | 301 | def on_credentials_found(self, app_name, credentials): | 305 | def on_credentials_found(self, app_name, credentials): |
830 | @@ -322,7 +326,6 @@ | |||
831 | 322 | def on_authorization_denied(self, app_name): | 326 | def on_authorization_denied(self, app_name): |
832 | 323 | """SSO backend notifies that user refused auth for 'app_name'.""" | 327 | """SSO backend notifies that user refused auth for 'app_name'.""" |
833 | 324 | self.set_property('greyed', False) | 328 | self.set_property('greyed', False) |
834 | 325 | self._set_warning(self.AUTHORIZATION_DENIED) | ||
835 | 326 | 329 | ||
836 | 327 | @log_call(logger.info) | 330 | @log_call(logger.info) |
837 | 328 | def on_network_state_changed(self, state): | 331 | def on_network_state_changed(self, state): |
838 | 329 | 332 | ||
839 | === modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py' | |||
840 | --- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-03 18:12:33 +0000 | |||
841 | +++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-04 13:50:22 +0000 | |||
842 | @@ -426,8 +426,8 @@ | |||
843 | 426 | """Callback 'on_authorization_denied' is correct.""" | 426 | """Callback 'on_authorization_denied' is correct.""" |
844 | 427 | self.ui.on_authorization_denied(gui.U1_APP_NAME) | 427 | self.ui.on_authorization_denied(gui.U1_APP_NAME) |
845 | 428 | self.assertTrue(self.ui.get_visible()) | 428 | self.assertTrue(self.ui.get_visible()) |
848 | 429 | self.assert_warning_correct(self.ui.warning_label, | 429 | self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.') |
849 | 430 | self.ui.AUTHORIZATION_DENIED) | 430 | self.assertEqual(self.ui.warning_label.get_text(), '') |
850 | 431 | 431 | ||
851 | 432 | 432 | ||
852 | 433 | class OverwiewPanelAppNameMismatchTestCase(OverwiewPanelTestCase): | 433 | class OverwiewPanelAppNameMismatchTestCase(OverwiewPanelTestCase): |
853 | @@ -549,6 +549,14 @@ | |||
854 | 549 | 549 | ||
855 | 550 | self.assertEqual(self.ui.warning_label.get_text(), '') | 550 | self.assertEqual(self.ui.warning_label.get_text(), '') |
856 | 551 | 551 | ||
857 | 552 | def test_learn_more_button_clicked(self): | ||
858 | 553 | """Test the 'learn more' button callback.""" | ||
859 | 554 | self.patch(gui, 'uri_hook', self._set_called) | ||
860 | 555 | self.ui.learn_more_button.clicked() | ||
861 | 556 | |||
862 | 557 | expected = (self.ui.learn_more_button, self.ui.LEARN_MORE_LINK) | ||
863 | 558 | self.assertEqual(self._called, (expected, {})) | ||
864 | 559 | |||
865 | 552 | def test_on_credentials_not_found_unset_greyed(self): | 560 | def test_on_credentials_not_found_unset_greyed(self): |
866 | 553 | """Callback 'on_credentials_not_found' unsets the 'greyed' prop.""" | 561 | """Callback 'on_credentials_not_found' unsets the 'greyed' prop.""" |
867 | 554 | self.ui.connect_button.clicked() | 562 | self.ui.connect_button.clicked() |
+1