Ubuntu One Control Panel

Merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/menu-status-actions into lp://qastaging/ubuntuone-control-panel

  1. menu-status-actions
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 346
Merged at revision: 342
Proposed branch: lp://qastaging/~diegosarmentero/ubuntuone-control-panel/menu-status-actions
Merge into: lp://qastaging/ubuntuone-control-panel
Prerequisite: lp://qastaging/~diegosarmentero/ubuntuone-control-panel/refactor-sync-status
Diff against target: 327 lines (+216/-31)
2 files modified
ubuntuone/controlpanel/gui/qt/systray.py (+76/-16)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+140/-15)
To merge this branch: bzr merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/menu-status-actions
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+119170@code.qastaging.launchpad.net

Commit message

- Adding status actions to the system tray menu (LP: #1034542).

Description of the change

For u1lint you should set the PYTHONPATH including this branch: lp:~diegosarmentero/ubuntuone-client/ipcmenu

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Please fix the following:

103 + self._backend_method = getattr(self.backend, data['backend_method'])

You should pass None to the getattr method to make sure you do not get an attr error. like:

103 + self._backend_method = getattr(self.backend, data['backend_method'], None)

review: Needs Fixing
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

> Please fix the following:
>
> 103 + self._backend_method = getattr(self.backend, data['backend_method'])
>
> You should pass None to the getattr method to make sure you do not get an attr
> error. like:
>
> 103 + self._backend_method = getattr(self.backend, data['backend_method'],
> None)

fixed

Revision history for this message
Manuel de la Peña (mandel) wrote :

I'm getting the following lint error:

== Python Lint Notices ==

ubuntuone/controlpanel/sd_client/__init__.py:
    211: [E1101, SyncDaemonClient.sync_menu] Instance of 'SyncDaemonTool' has no 'sync_menu' member

review: Needs Fixing
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good after the fixes.

review: Approve
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The prerequisite https://code.launchpad.net/~diegosarmentero/ubuntuone-control-panel/refactor-sync-status has not yet been merged into https://code.launchpad.net/~ubuntuone-control-tower/ubuntuone-control-panel/trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches