lp:~raoul-snyman/openlp/bug-1386896

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2435

Tim Bentley: Approve on 2014-10-31

Diff: 94 lines (+47/-3)

3 files modified

openlp/core/ui/media/vlcplayer.py (+2/-1)
openlp/core/ui/settingsform.py (+17/-2)
tests/functional/openlp_core_ui/test_settingsform.py (+28/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1386896: OpenLP fails to open when VLC is not installed on Mac OS X

High

Fix Released

Link a bug report

Related blueprints

2435. By Raoul Snyman on 2014-10-30

Two fixes:
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
- Found a potential bug where the settings form was canceled, with one or more inactive plugins
- Wrote a test for the above settings form bug

2434. By Ken Roberts on 2014-10-28

Add basic remote control of networked projectors using PJLink control format.

2433. By Raoul Snyman on 2014-10-28

Settings Form - check if the item is valid first

2432. By Raoul Snyman on 2014-10-28

Fix traceback after settings form is saved

2431. By Tomas Groth on 2014-10-28

Various small bugfixes:
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.

2430. By Tim Bentley on 2014-10-27

Fix final debug method errors

2429. By Raoul Snyman on 2014-10-25

[fix #1385438] Make list widget items select tab pages via user data rather than just their position.

2428. By Raoul Snyman on 2014-10-23

Fix up the look and feel of the wizards after I messed it up with my changes for OS X
Added and updated tests:
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests
Updated setup.py with some Python3 changes.
Merged HEAD
Forgot to catch the cancel_wizard_text refactor

2427. By Tomas Groth on 2014-10-21

Ask the user if a backup of the data folder should be created after upgrading

2426. By Samuel Mehrbrodt on 2014-10-21

Update jQuery and jQuery Mobile