Merge lp:~chrismcginlay/ubuntuone-control-panel/fixes_715820 into lp:ubuntuone-control-panel
Proposed by
Chris McGinlay
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 73 | ||||
Merged at revision: | 80 | ||||
Proposed branch: | lp:~chrismcginlay/ubuntuone-control-panel/fixes_715820 | ||||
Merge into: | lp:ubuntuone-control-panel | ||||
Diff against target: |
290 lines (+107/-22) 2 files modified
ubuntuone/controlpanel/gtk/gui.py (+29/-8) ubuntuone/controlpanel/gtk/tests/test_gui.py (+78/-14) |
||||
To merge this branch: | bzr merge lp:~chrismcginlay/ubuntuone-control-panel/fixes_715820 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Natalia Bidart (community) | Approve | ||
Review via email: mp+50417@code.launchpad.net |
Commit message
- Implement tooltips for Connect/Disconnect and Account/
Description of the change
Implement tooltips for Connect/Disconnect and Account/
Modified _update_status(), adding tooltip-None argument after callback argument
Modified ManagementPanel
Set up corresponding tests, asserting existence and validity of tooltips.
To post a comment you must log in.
Chris,
Thanks for working on this! The branch is good to go except for a few things that need fixing:
* the adding of tooltip=None in _update_status should be the last argument, to maintain compatibility of the function API.
* for completeness sake, you should add tooltips (and the matching tests) for the rest of the buttons (ENABLE, RESTART, START, STOP). See below for proper strings to use as tooltips.
* tooltip strings should be (always start with an action since is a button tooltip):
CONNECT_TOOLTIP = _('Connect the file sync service with your personal cloud.') TOOLTIP = _('Disconnect the file sync service from your personal cloud.')
DISCONNECT_
ENABLE_TOOLTIP = _('Enable the file sync service.')
RESTART_TOOLTIP = _('Restart the file sync service.')
START_TOOLTIP = _('Start the file sync service.')
STOP_TOOLTIP = _('Stop the file sync service.')
DASHBOARD_ BUTTON_ TOOLTIP = _('View your personal details and service summary.') BUTTON_ TOOLTIP = _('Manage devices registered with your personal cloud.') BUTTON_ TOOLTIP = _('Manage your cloud folders.')
DEVICES_
VOLUMES_
* fix a couple of docstrings to be PEP-257 compliant:
"""The file sync status is disconnected.
* The correct connection status is displayed.
* The button has a tooltip.
* The correct connect tooltip is set.
"""
should be
"""The file sync status is disconnected.
* The correct connection status is displayed.
* The button has a tooltip.
* The correct connect tooltip is set.
"""
(same for docstring in test_on_ file_sync_ status_ syncing) .
* Instead of duplicate the adding of the assertions
modify assert_ status_ correct to receive the tooltip and assert over it in only one place.
One again, thanks a lot! This is pretty close to be landed.