lp:~mikemc/ubuntuone-control-panel/fix-native-dialog
Created by
Mike McCracken
and last modified
- Get this branch:
- bzr branch lp:~mikemc/ubuntuone-control-panel/fix-native-dialog
Only
Mike McCracken
can upload to this branch. If you are
Mike McCracken
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- dobey (community): Approve
- MichaĆ Karnicki (community): Approve
-
Diff: 282 lines (+116/-48)6 files modifiedubuntuone/controlpanel/gui/qt/addfolder.py (+12/-4)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+2/-1)
ubuntuone/controlpanel/gui/qt/main/darwin.py (+21/-0)
ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py (+40/-0)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+0/-40)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+41/-3)
Related bugs
Related blueprints
Branch information
Recent revisions
- 395. By Mike McCracken
-
re-add test cleanup that crashes test suite on darwin. Commenting it out is a hack that shouldn't end up in trunk, probably.
- 394. By Mike McCracken
-
raise after using file dialog, necessary on darwin because dialog is shown by a separate hidden process
- 392. By Mike McCracken
-
Change darwin file dialog function into class method to match QFileDialog and make testing simpler. Move patches for QFileDialog into test_addfolder so we can patch addfolder.
FileDialog cleanly. - 390. By Mike McCracken
-
Add darwin-specific applescript hack to show native open dialog instead of ugly qt thing.
- 387. By Mike McCracken
-
- Trivial fix to make a test in test_folders actually run.
The test wasn't using the inlineCallbacks decorator, so it never returned from the first yield, but this wasn't treated as an error, the test passed.
Tested on mac/win/ubuntu 12.10
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntuone-control-panel