Merge lp://qastaging/~raoul-snyman/openlp/mac-niggles-2.4 into lp://qastaging/openlp/2.4
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 2663 | ||||
| Proposed branch: | lp://qastaging/~raoul-snyman/openlp/mac-niggles-2.4 | ||||
| Merge into: | lp://qastaging/openlp/2.4 | ||||
| Diff against target: |
341 lines (+123/-74) 8 files modified
openlp/core/__init__.py (+16/-5) openlp/core/ui/mainwindow.py (+9/-13) openlp/core/ui/mediadockmanager.py (+1/-1) openlp/core/ui/themewizard.py (+1/-1) tests/functional/openlp_core_ui/test_aboutform.py (+30/-20) tests/functional/openlp_core_ui/test_shortcutlistdialog.py (+60/-0) tests/functional/test_init.py (+6/-2) tests/interfaces/openlp_core_ui/test_shortcutlistform.py (+0/-32) |
||||
| To merge this branch: | bzr merge lp://qastaging/~raoul-snyman/openlp/mac-niggles-2.4 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Bentley | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix bug #1645867 by setting an application attribute related to OpenGL
Set the width of the Theme wizard so that it doesn't resize by itself
Hide the splash screen when the backup dialog shows and when the exception form shows
Add icons back into the media library tabs
Add this to your merge proposal:
-------
lp:~raoul-snyman/openlp/mac-niggles-2.4 (revision 2666)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
| Tim Bentley (trb143) | # |
