Merge lp://qastaging/~mikemc/ubuntuone-control-panel/launch-separate-darwin-menu into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | Mike McCracken |
| Approved revision: | 383 |
| Merged at revision: | 385 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/launch-separate-darwin-menu |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
420 lines (+226/-26) 6 files modified
ubuntuone/controlpanel/backend.py (+5/-0) ubuntuone/controlpanel/gui/qt/main/__init__.py (+22/-6) ubuntuone/controlpanel/gui/qt/main/darwin.py (+52/-8) ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py (+104/-5) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+17/-7) ubuntuone/controlpanel/tests/test_backend.py (+26/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/launch-separate-darwin-menu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Diego Sarmentero (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Add support for menu in separate process on darwin. (LP: #1045939)
Description of the change
- Add support for menu in separate process on darwin. (LP: #1045939)
- cmd-q handler in control panel no longer kills syncdaemon
- control panel waits until it gets first syncdaemon status update then launches menu to avoid IPC race in syncdaemontool.
Tests pass on darwin and linux P+Q.
To test IRL on darwin, you need lp:ubuntuone-cocoa-menu, and then you *MUST* package the entire app.
The ubuntuone-
PyObjC works from source in general, but the Cocoa UI loading code doesn't handle that case.
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1
"Let's put a smile on that face!" [The Dark Knight]