OpenLP

Merge lp://qastaging/~tomasgroth/openlp/fixes-201906-a into lp://qastaging/openlp

  1. fixes-201906-a
  2. Merge into trunk
Proposed by Tomas Groth
Status: Merged
Merged at revision: 2879
Proposed branch: lp://qastaging/~tomasgroth/openlp/fixes-201906-a
Merge into: lp://qastaging/openlp
Diff against target: 98 lines (+9/-10)
6 files modified
openlp/core/common/settings.py (+1/-4)
openlp/core/ui/media/vlcplayer.py (+1/-1)
openlp/core/ui/thememanager.py (+1/-1)
openlp/plugins/songs/songsplugin.py (+2/-2)
scripts/appveyor.yml (+1/-1)
tests/openlp_core/ui/test_themeform.py (+3/-1)
To merge this branch: bzr merge lp://qastaging/~tomasgroth/openlp/fixes-201906-a
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+368677@code.qastaging.launchpad.net

Commit message

Added Pyro4 to appveyor to make the latest tests run.
Fixed test on windows by mocking out render.
Missed a rename of _write_theme to save_theme.
Loading VLC module can also result in an OSError
Set the default value of core/display_on_monitor to False to avoid blocking the screen with the display window on first start.
Set song import/export default directory to None
Add a webengine view for previewing themes. Made VLC loading more robust. A few minor fixes.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.