Merge lp:~phill-ridout/openlp/bug1209515 into lp:openlp
Proposed by
Phill
Status: | Merged |
---|---|
Approved by: | Tim Bentley |
Approved revision: | 2292 |
Merged at revision: | 2314 |
Proposed branch: | lp:~phill-ridout/openlp/bug1209515 |
Merge into: | lp:openlp |
Diff against target: |
287 lines (+151/-10) 9 files modified
openlp/core/common/uistrings.py (+2/-0) openlp/core/lib/__init__.py (+1/-1) openlp/core/lib/filedialog.py (+66/-0) openlp/core/lib/mediamanageritem.py (+2/-2) openlp/core/ui/thememanager.py (+2/-2) openlp/plugins/songs/forms/editsongform.py (+2/-2) openlp/plugins/songs/forms/songimportform.py (+2/-2) tests/functional/openlp_core_lib/test_file_dialog.py (+73/-0) tests/functional/openlp_core_lib/test_htmlbuilder.py (+1/-1) |
To merge this branch: | bzr merge lp:~phill-ridout/openlp/bug1209515 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+195486@code.launchpad.net |
This proposal supersedes a proposal from 2013-11-16.
Description of the change
Fixes Bug 1209515 by sub classing QFileDialog and reimplementing getOpenFileNames and attempting to urlunquote and file paths which do not exist
To post a comment you must log in.
Please resubmit due to the age of this request and additionally it will need converting to Python 3 as on 1/9/2013 truck will be converted.