Merge lp:~nataliabidart/ubuntuone-control-panel/evo-thunderbird into lp:ubuntuone-control-panel

Proposed by Natalia Bidart on 2011-09-14
Status: Merged
Approved by: dobey on 2011-09-19
Approved revision: 229
Merged at revision: 230
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/evo-thunderbird
Merge into: lp:ubuntuone-control-panel
Diff against target: 451 lines (+27/-199)
9 files modified
data/gtk/overview.ui (+1/-1)
data/gtk/services.ui (+16/-86)
ubuntuone/controlpanel/backend.py (+2/-17)
ubuntuone/controlpanel/dbus_service.py (+0/-40)
ubuntuone/controlpanel/dbustests/test_dbus_service.py (+3/-34)
ubuntuone/controlpanel/gui/__init__.py (+1/-3)
ubuntuone/controlpanel/gui/gtk/gui.py (+1/-11)
ubuntuone/controlpanel/replication_client.py (+1/-2)
ubuntuone/controlpanel/tests/test_backend.py (+2/-5)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/evo-thunderbird
Reviewer Review Type Date Requested Status
dobey (community) 2011-09-14 Approve on 2011-09-19
John Lenton Approve on 2011-09-15
Review via email: mp+75410@code.launchpad.net

Commit message

- Removed all code related to Bookmarks (LP: #850142).
- Replaces references to "Evolution" by "Thunderbird" (LP: #849494).

To post a comment you must log in.
John Lenton (chipaca) wrote :

Looks fine to me.

review: Approve
dobey (dobey) wrote :

CONTACTS_PKG = 'evolution-couchdb'

Can you change the package to be 'thunderbird-couchdb' as well please? As per https://bugs.launchpad.net/ubuntuone-control-panel/+bug/849494/comments/8

228. By Natalia Bidart on 2011-09-16

Merged trunk in.

229. By Natalia Bidart on 2011-09-16

Changing CONTACTS_PKG to be 'thunderbird-couchdb'.

Natalia Bidart (nataliabidart) wrote :

Done!

dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gtk/overview.ui'
2--- data/gtk/overview.ui 2011-09-06 14:04:10 +0000
3+++ data/gtk/overview.ui 2011-09-16 16:42:25 +0000
4@@ -150,7 +150,7 @@
5 <property name="can_focus">False</property>
6 <property name="xalign">0</property>
7 <property name="label" translatable="yes">Stay Productive
8-&lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
9+&lt;span foreground="#909090"&gt;Keep your Tomboy notes synced&lt;/span&gt;</property>
10 <property name="use_markup">True</property>
11 <property name="wrap">True</property>
12 </object>
13
14=== modified file 'data/gtk/services.ui'
15--- data/gtk/services.ui 2011-07-11 11:19:09 +0000
16+++ data/gtk/services.ui 2011-09-16 16:42:25 +0000
17@@ -59,16 +59,21 @@
18 <property name="use_action_appearance">False</property>
19 <property name="draw_indicator">True</property>
20 </object>
21+ <packing>
22+ <property name="x_options"></property>
23+ <property name="y_options"></property>
24+ </packing>
25 </child>
26 <child>
27 <object class="GtkImage" id="files_icon">
28 <property name="visible">True</property>
29 <property name="can_focus">False</property>
30- <property name="xpad">5</property>
31 </object>
32 <packing>
33 <property name="left_attach">1</property>
34 <property name="right_attach">2</property>
35+ <property name="x_options"></property>
36+ <property name="y_options"></property>
37 </packing>
38 </child>
39 <child>
40@@ -154,8 +159,6 @@
41 <object class="GtkImage" id="files_example">
42 <property name="visible">True</property>
43 <property name="can_focus">False</property>
44- <property name="xpad">5</property>
45- <property name="ypad">5</property>
46 </object>
47 <packing>
48 <property name="expand">False</property>
49@@ -188,6 +191,7 @@
50 <object class="GtkAlignment" id="alignment3">
51 <property name="visible">True</property>
52 <property name="can_focus">False</property>
53+ <property name="top_padding">6</property>
54 <child>
55 <object class="GtkHBox" id="hbox3">
56 <property name="visible">True</property>
57@@ -203,6 +207,7 @@
58 <property name="can_focus">False</property>
59 <property name="n_rows">2</property>
60 <property name="n_columns">3</property>
61+ <property name="column_spacing">5</property>
62 <property name="row_spacing">5</property>
63 <child>
64 <object class="GtkCheckButton" id="contacts_check">
65@@ -212,16 +217,21 @@
66 <property name="use_action_appearance">False</property>
67 <property name="draw_indicator">True</property>
68 </object>
69+ <packing>
70+ <property name="x_options"></property>
71+ <property name="y_options"></property>
72+ </packing>
73 </child>
74 <child>
75 <object class="GtkImage" id="contacts_icon">
76 <property name="visible">True</property>
77 <property name="can_focus">False</property>
78- <property name="xpad">5</property>
79 </object>
80 <packing>
81 <property name="left_attach">1</property>
82 <property name="right_attach">2</property>
83+ <property name="x_options"></property>
84+ <property name="y_options"></property>
85 </packing>
86 </child>
87 <child>
88@@ -245,7 +255,6 @@
89 <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
90 <property name="use_markup">True</property>
91 <property name="wrap">True</property>
92- <property name="width_chars">35</property>
93 </object>
94 <packing>
95 <property name="left_attach">2</property>
96@@ -269,92 +278,13 @@
97 </child>
98 </object>
99 <packing>
100- <property name="expand">False</property>
101+ <property name="expand">True</property>
102 <property name="fill">True</property>
103 <property name="position">0</property>
104 </packing>
105 </child>
106 <child>
107- <object class="GtkVBox" id="bookmarks">
108- <property name="visible">True</property>
109- <property name="can_focus">False</property>
110- <child>
111- <object class="GtkTable" id="bookmarks_sync">
112- <property name="visible">True</property>
113- <property name="can_focus">False</property>
114- <property name="n_rows">2</property>
115- <property name="n_columns">3</property>
116- <property name="row_spacing">5</property>
117- <child>
118- <object class="GtkCheckButton" id="bookmarks_check">
119- <property name="visible">True</property>
120- <property name="can_focus">True</property>
121- <property name="receives_default">False</property>
122- <property name="use_action_appearance">False</property>
123- <property name="draw_indicator">True</property>
124- </object>
125- </child>
126- <child>
127- <object class="GtkImage" id="bookmarks_icon">
128- <property name="visible">True</property>
129- <property name="can_focus">False</property>
130- <property name="xpad">5</property>
131- </object>
132- <packing>
133- <property name="left_attach">1</property>
134- <property name="right_attach">2</property>
135- </packing>
136- </child>
137- <child>
138- <object class="GtkLabel" id="label6">
139- <property name="visible">True</property>
140- <property name="can_focus">False</property>
141- <property name="xalign">0</property>
142- <property name="label" translatable="yes">Enable Bookmarks Sync</property>
143- </object>
144- <packing>
145- <property name="left_attach">2</property>
146- <property name="right_attach">3</property>
147- </packing>
148- </child>
149- <child>
150- <object class="GtkLabel" id="label7">
151- <property name="visible">True</property>
152- <property name="can_focus">False</property>
153- <property name="xalign">0</property>
154- <property name="yalign">0</property>
155- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
156- <property name="use_markup">True</property>
157- <property name="wrap">True</property>
158- <property name="width_chars">30</property>
159- </object>
160- <packing>
161- <property name="left_attach">2</property>
162- <property name="right_attach">3</property>
163- <property name="top_attach">1</property>
164- <property name="bottom_attach">2</property>
165- </packing>
166- </child>
167- <child>
168- <placeholder/>
169- </child>
170- <child>
171- <placeholder/>
172- </child>
173- </object>
174- <packing>
175- <property name="expand">False</property>
176- <property name="fill">True</property>
177- <property name="position">0</property>
178- </packing>
179- </child>
180- </object>
181- <packing>
182- <property name="expand">False</property>
183- <property name="fill">True</property>
184- <property name="pack_type">end</property>
185- <property name="position">1</property>
186- </packing>
187+ <placeholder/>
188 </child>
189 </object>
190 </child>
191
192=== modified file 'ubuntuone/controlpanel/backend.py'
193--- ubuntuone/controlpanel/backend.py 2011-09-09 15:05:22 +0000
194+++ ubuntuone/controlpanel/backend.py 2011-09-16 16:42:25 +0000
195@@ -67,8 +67,7 @@
196 MSG_KEY = 'message'
197 STATUS_KEY = 'status'
198
199-BOOKMARKS_PKG = 'xul-ext-bindwood'
200-CONTACTS_PKG = 'evolution-couchdb'
201+CONTACTS_PKG = 'thunderbird-couchdb'
202
203
204 def append_path_sep(path):
205@@ -709,9 +708,7 @@
206 result = []
207 for rep in replications:
208 dependency = ''
209- if rep == replication_client.BOOKMARKS:
210- dependency = BOOKMARKS_PKG
211- elif rep == replication_client.CONTACTS:
212+ if rep == replication_client.CONTACTS:
213 dependency = CONTACTS_PKG
214
215 repd = {
216@@ -736,18 +733,6 @@
217 returnValue(replication_id)
218
219 @log_call(logger.debug)
220- def query_bookmark_extension(self):
221- """True if the bookmark extension has been installed."""
222- # still pending (LP: #673672)
223- returnValue(False)
224-
225- @log_call(logger.debug)
226- def install_bookmarks_extension(self):
227- """Install the extension to sync bookmarks."""
228- # still pending (LP: #673673)
229- returnValue(None)
230-
231- @log_call(logger.debug)
232 @inlineCallbacks
233 def file_sync_settings_info(self):
234 """Get the file sync settings info."""
235
236=== modified file 'ubuntuone/controlpanel/dbus_service.py'
237--- ubuntuone/controlpanel/dbus_service.py 2011-08-25 16:10:09 +0000
238+++ ubuntuone/controlpanel/dbus_service.py 2011-09-16 16:42:25 +0000
239@@ -563,46 +563,6 @@
240
241 #---
242
243- @log_call(logger.debug)
244- @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
245- def query_bookmark_extension(self):
246- """Check if the extension to sync bookmarks is installed."""
247- d = self.backend.query_bookmark_extension()
248- d.addCallback(self.QueryBookmarksResult)
249- d.addErrback(self.transform(self.QueryBookmarksError))
250-
251- @log_call(logger.debug)
252- @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="b")
253- def QueryBookmarksResult(self, enabled):
254- """The bookmark extension is or is not installed."""
255-
256- @log_call(logger.error)
257- @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
258- def QueryBookmarksError(self, error):
259- """Problem getting the status of the extension."""
260-
261- #---
262-
263- @log_call(logger.info)
264- @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
265- def install_bookmarks_extension(self):
266- """Install the extension to sync bookmarks."""
267- d = self.backend.install_bookmarks_extension()
268- d.addCallback(lambda _: self.InstallBookmarksSuccess())
269- d.addErrback(self.transform(self.InstallBookmarksError))
270-
271- @log_call(logger.info)
272- @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="")
273- def InstallBookmarksSuccess(self):
274- """The extension to sync bookmarks has been installed."""
275-
276- @log_call(logger.error)
277- @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
278- def InstallBookmarksError(self, error):
279- """Problem installing the extension to sync bookmarks."""
280-
281- #---
282-
283 @log_call(logger.info)
284 @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
285 def shutdown(self):
286
287=== modified file 'ubuntuone/controlpanel/dbustests/test_dbus_service.py'
288--- ubuntuone/controlpanel/dbustests/test_dbus_service.py 2011-08-25 15:49:58 +0000
289+++ ubuntuone/controlpanel/dbustests/test_dbus_service.py 2011-09-16 16:42:25 +0000
290@@ -50,7 +50,7 @@
291 "limit_bandwidth": True,
292 "max_upload_speed": 12345,
293 "max_download_speed": 54321,
294- "available_services": "files, contacts, music, bookmarks",
295+ "available_services": "files, contacts, music",
296 "enabled_services": "files, music",
297 },
298 {
299@@ -59,8 +59,8 @@
300 "date_added": "2010-09-22T20:45:38.0",
301 "type": "computer",
302 "configurable": False,
303- "available_services": "files, contacts, bookmarks",
304- "enabled_services": "files, bookmarks",
305+ "available_services": "files, contacts",
306+ "enabled_services": "files",
307 },
308 ]
309
310@@ -244,14 +244,6 @@
311 """Configure a given replication."""
312 return self._process(replication_id)
313
314- def query_bookmark_extension(self):
315- """True if the bookmark extension has been installed."""
316- return self._process(False)
317-
318- def install_bookmarks_extension(self):
319- """Install the extension to sync bookmarks."""
320- return self._process(None)
321-
322 def shutdown(self):
323 """Stop this service."""
324 self.shutdown_func()
325@@ -616,29 +608,6 @@
326 expected_replication_id, {'enabled': ''})
327 return self.assert_correct_method_call(*args)
328
329- def test_query_bookmarks_extension(self):
330- """The bookmarks extension is queried."""
331-
332- def got_signal(enabled):
333- """The correct status was received."""
334- self.assertEqual(enabled, False)
335- self.deferred.callback("success")
336-
337- args = ("QueryBookmarksResult", "QueryBookmarksError", got_signal,
338- self.backend.query_bookmark_extension)
339- return self.assert_correct_method_call(*args)
340-
341- def test_install_bookmarks_extension(self):
342- """The bookmarks extension is installed."""
343-
344- def got_signal():
345- """The extension was installed."""
346- self.deferred.callback("success")
347-
348- args = ("InstallBookmarksSuccess", "InstallBookmarksError", got_signal,
349- self.backend.install_bookmarks_extension)
350- return self.assert_correct_method_call(*args)
351-
352
353 class OperationsErrorTestCase(OperationsTestCase):
354 """Test for the DBus service operations when there is an error."""
355
356=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
357--- ubuntuone/controlpanel/gui/__init__.py 2011-09-08 19:37:50 +0000
358+++ ubuntuone/controlpanel/gui/__init__.py 2011-09-16 16:42:25 +0000
359@@ -51,7 +51,6 @@
360 MUSIC_STORE_ICON = 'music-store.png'
361 MUSIC_STREAM_ICON = 'music-stream.png'
362 NOTES_ICON = 'notes.png'
363-SERVICES_BOOKMARKS_ICON = 'services-bookmarks.png'
364 SERVICES_CONTACTS_ICON = 'services-contacts.png'
365 SERVICES_FILES_EXAMPLE = 'services-files-example.png'
366 SERVICES_FILES_ICON = 'services-files.png'
367@@ -73,9 +72,8 @@
368 TWITTER_LINK = 'http://twitter.com/ubuntuone/'
369
370 ALWAYS_SUBSCRIBED = _('Always in sync')
371-BOOKMARKS = _('Firefox extension')
372 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
373-CONTACTS = _('Evolution plug-in')
374+CONTACTS = _('Thunderbird plug-in')
375 CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
376 DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
377 'summary')
378
379=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
380--- ubuntuone/controlpanel/gui/gtk/gui.py 2011-08-23 05:29:30 +0000
381+++ ubuntuone/controlpanel/gui/gtk/gui.py 2011-09-16 16:42:25 +0000
382@@ -1118,11 +1118,8 @@
383 self.files_icon.set_from_file(get_data_file(SERVICES_FILES_ICON))
384 self.files_example.set_from_file(get_data_file(SERVICES_FILES_EXAMPLE))
385 self.contacts_icon.set_from_file(get_data_file(SERVICES_CONTACTS_ICON))
386- icon = get_data_file(SERVICES_BOOKMARKS_ICON)
387- self.bookmarks_icon.set_from_file(icon)
388
389- self.plugin_names = {'contacts': CONTACTS,
390- 'bookmarks': BOOKMARKS}
391+ self.plugin_names = {'contacts': CONTACTS}
392
393 self.package_manager = package_manager.PackageManager()
394 self.install_box = None
395@@ -1161,13 +1158,6 @@
396 """
397 uri_hook(None, CONTACTS)
398
399- def on_bookmarks_button_clicked(self, *args, **kwargs):
400- """The bookmarks button was clicked.
401-
402- XXX: this should be part of the DesktopcouchService widget.
403-
404- """
405-
406 @log_call(logger.debug)
407 def load(self):
408 """Load info."""
409
410=== modified file 'ubuntuone/controlpanel/replication_client.py'
411--- ubuntuone/controlpanel/replication_client.py 2011-05-24 18:53:54 +0000
412+++ ubuntuone/controlpanel/replication_client.py 2011-09-16 16:42:25 +0000
413@@ -25,10 +25,9 @@
414
415 logger = setup_logging('replication_client')
416
417-BOOKMARKS = 'bookmarks'
418 CONTACTS = 'contacts'
419 # we should get this list from somewhere else
420-REPLICATIONS = set([BOOKMARKS, CONTACTS])
421+REPLICATIONS = set([CONTACTS])
422
423
424 class ReplicationError(Exception):
425
426=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
427--- ubuntuone/controlpanel/tests/test_backend.py 2011-09-09 15:05:22 +0000
428+++ ubuntuone/controlpanel/tests/test_backend.py 2011-09-16 16:42:25 +0000
429@@ -304,10 +304,9 @@
430 class MockReplicationClient(CallRecorder):
431 """A mock replication_client module."""
432
433- BOOKMARKS = 'awesome'
434 CONTACTS = 'legendary'
435
436- replications = set([BOOKMARKS, CONTACTS, 'other'])
437+ replications = set([CONTACTS, 'other'])
438 exclusions = set([CONTACTS])
439
440 def get_replications(self):
441@@ -1430,9 +1429,7 @@
442 for name in MockReplicationClient.replications:
443 enabled = name not in MockReplicationClient.exclusions
444 dependency = ''
445- if name == MockReplicationClient.BOOKMARKS:
446- dependency = backend.BOOKMARKS_PKG
447- elif name == MockReplicationClient.CONTACTS:
448+ if name == MockReplicationClient.CONTACTS:
449 dependency = backend.CONTACTS_PKG
450
451 item = {'replication_id': name, 'name': name,

Subscribers

People subscribed via source and target branches