Merge lp:~nataliabidart/ubuntuone-control-panel/selectable-labels into lp:ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Approved by: dobey
Approved revision: 134
Merged at revision: 132
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/selectable-labels
Merge into: lp:ubuntuone-control-panel
Diff against target: 53 lines (+11/-1)
3 files modified
ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+1/-1)
ubuntuone/controlpanel/gtk/tests/test_widgets.py (+8/-0)
ubuntuone/controlpanel/gtk/widgets.py (+2/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/selectable-labels
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
dobey (community) Approve
Review via email: mp+57206@code.launchpad.net

Commit message

- Made panel title selectable. Tab messages are now also selectable (LP: #757543).

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (683.4 KiB)

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/selectable-labels into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel
Xlib: extension "RANDR" missing on display ":99".
ERROR:root:Could not find any typelib for Unity
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... DEBUG:ubuntuone.controlpanel.backend:setting status_changed_handler to <function <lambda> at 0xaca8d4c>
DEBUG:ubuntuone.controlpanel.backend:account_info: args (<ubuntuone.controlpanel.backend.ControlBackend object at 0xacb188c>,), kwargs {}.
DEBUG:ubuntuone.controlpanel.backend:account_info from api call: {'username': 'andrewpz', 'openid': 'https://login.launchpad.net/+id/abcdefg', 'first_name': 'Andrew P.', 'last_name': 'Zoilo', 'couchdb': {'host': 'https://couchdb.one.ubuntu.com', 'root': 'https://couchdb.one.ubuntu.com/u/abc/def/12345', 'dbpath': 'u/abc/def/12345'}, 'couchdb_root': 'https://couchdb.one.ubuntu.com/u/abc/def/12345', 'id': 12345, 'nickname': 'Andrew P. Zoilo', 'email': '<email address hidden>', 'subscription': {'description': 'Paid Plan, 50 GB of storage', 'currency': None, 'started': '2010-03-24T18:38:38Z', 'is_paid': True, 'expires': None, 'qty': 1, 'price': 0.0, 'trial': False, 'id': 654321, 'upgrade_available': False, 'name': '50 GB'}}
                                                 [OK]
    test_account_info_fails ... DEBUG:ubuntuone.controlpanel.backend:setting status_changed_handler to <function <lambda> at 0xaca8ed4>
DEBUG:ubuntuone.controlpanel.backend:account_info: args (<ubuntuone.controlpanel.backend.ControlBackend object at 0xacb932c>,), kwargs {}.
                                           [OK]
    test_account_info_fails_with_unauthorized ... DEBUG:ubuntuone.controlpanel.backend:setting status_changed_handler to <function <lambda> at 0xaca8d14>
DEBUG:ubuntuone.controlpanel.backend:account_info: args (<ubuntuone.controlpanel.backend.ControlBackend object at 0xacb954c>,), kwargs {}.
ERROR:ubuntuone.controlpanel.backend:process_unauthorized (clearing credentials):
Traceback (most recent call last):
  File "/var/cache/tarmac/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/backend.py", line 85, in inner
    result = yield f(*args, **kwargs)
UnauthorizedError: 401
                         [OK]
    test_account_info_with_current_plan ... DEBUG:ubuntuone.controlpanel.backend:setting status_changed_handler to <function <lambda> at 0xaca8fb4>
DEBUG:ubuntuone.controlpanel.backend:account_info: args (<ubuntuone.controlpanel.backend.ControlBackend object at 0xae1a0cc>,), kwargs {}.
DEBUG:ubuntuone.controlpanel.backend:account_info from api call: {'username': 'andrewpz', 'openid': 'https://login.launchpad.net/+id/abcdefg', 'first_name': 'Andrew P.', 'last_name': 'Zoilo', 'couchdb': {'host': 'https://couchdb.one.ubuntu.com', 'root': 'https://couchdb.one.ubuntu.com/u/abc/def/12345', 'dbpath': 'u/abc/def/12345'}, 'couchdb_root': 'https://couchdb.one.ubuntu.com/u/abc/def/12345', 'id': 12345, 'current_plan': 'Ubuntu One Basic (2 GB) + 1 x 20-Pack with 20 GB (monthly)', 'nickname': 'Andrew P. Zoilo', 'email': 'andrewpz@protoc...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
2--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-04-07 19:00:54 +0000
3+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-04-11 18:04:29 +0000
4@@ -143,7 +143,7 @@
5 THE_FLEP.urgent = True
6 self.patch(gui.Unity, "LauncherEntry", FakeLauncherEntry)
7 cp = gui.ControlPanelWindow()
8- cp.emit('focus-in-event', None)
9+ cp.emit('focus-in-event', gui.gtk.gdk.Event(gui.gtk.gdk.FOCUS_CHANGE))
10 self.assertEqual(
11 False, THE_FLEP.urgent, 'remove_urgency should have been called.')
12
13
14=== modified file 'ubuntuone/controlpanel/gtk/tests/test_widgets.py'
15--- ubuntuone/controlpanel/gtk/tests/test_widgets.py 2011-03-18 04:50:05 +0000
16+++ ubuntuone/controlpanel/gtk/tests/test_widgets.py 2011-04-11 18:04:29 +0000
17@@ -148,6 +148,10 @@
18 actual = widget.loading.spinner.style.fg[widgets.gtk.STATE_NORMAL]
19 self.assertEqual(actual, widgets.gtk.gdk.Color(expected))
20
21+ def test_selectable(self):
22+ """The widget is selectable."""
23+ self.assertTrue(self.widget.label.get_selectable())
24+
25
26 class PanelTitleTestCase(TestCase):
27 """Tets case for a special title for each management panel."""
28@@ -186,3 +190,7 @@
29 """The label padding is correct."""
30 self.assertEqual(self.widget.get_padding(),
31 widgets.DEFAULT_PADDING)
32+
33+ def test_selectable(self):
34+ """The widget is selectable."""
35+ self.assertTrue(self.widget.get_selectable())
36
37=== modified file 'ubuntuone/controlpanel/gtk/widgets.py'
38--- ubuntuone/controlpanel/gtk/widgets.py 2011-03-18 04:48:34 +0000
39+++ ubuntuone/controlpanel/gtk/widgets.py 2011-04-11 18:04:29 +0000
40@@ -55,6 +55,7 @@
41 self.loading = Loading(loading_label, fg_color=fg_color)
42
43 self.label = gtk.Label()
44+ self.label.set_selectable(True)
45 self.label.show()
46 if fg_color is not None:
47 self.label.modify_fg(gtk.STATE_NORMAL, gtk.gdk.Color(fg_color))
48@@ -113,6 +114,7 @@
49 self.set_property('xalign', 0.0)
50 self.set_line_wrap(True)
51 self.set_line_wrap_mode(pango.WRAP_WORD)
52+ self.set_selectable(True)
53 self.show_all()
54
55

Subscribers

People subscribed via source and target branches