Merge lp:~ralsina/ubuntuone-control-panel/you-have-two-options into lp:ubuntuone-control-panel
Proposed by
Roberto Alsina
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 237 |
Merged at revision: | 227 |
Proposed branch: | lp:~ralsina/ubuntuone-control-panel/you-have-two-options |
Merge into: | lp:ubuntuone-control-panel |
Diff against target: |
263 lines (+134/-37) 6 files modified
bin/ubuntuone-control-panel-qt (+8/-3) ubuntuone/controlpanel/gui/qt/gui.py (+20/-4) ubuntuone/controlpanel/gui/qt/main/linux.py (+6/-13) ubuntuone/controlpanel/gui/qt/main/windows.py (+7/-15) ubuntuone/controlpanel/gui/qt/systray.py (+2/-2) ubuntuone/controlpanel/gui/qt/tests/test_start.py (+91/-0) |
To merge this branch: | bzr merge lp:~ralsina/ubuntuone-control-panel/you-have-two-options |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Approve | ||
Review via email:
|
Commit message
Adds a --with-icon option to control panel.
Description of the change
Adds a --with-icon option to control panel.
To test IRL:
* Run bin/ubuntuone-
* Run bin/ubuntuone-
* Run bin/ubuntuone-
If you want to:
* Run bin/ubuntuone-
To post a comment you must log in.
Tests missing!