OpenLP

Merge lp://qastaging/~trb143/openlp/latest-fixes into lp://qastaging/openlp

  1. latest-fixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: 2898
Proposed branch: lp://qastaging/~trb143/openlp/latest-fixes
Merge into: lp://qastaging/openlp
Diff against target: 350 lines (+154/-27)
7 files modified
openlp/core/display/render.py (+21/-1)
openlp/core/lib/serviceitem.py (+7/-1)
openlp/core/ui/mainwindow.py (+2/-1)
openlp/core/ui/servicemanager.py (+11/-18)
openlp/plugins/presentations/lib/maclocontroller.py (+2/-1)
openlp/plugins/songs/forms/editsongdialog.py (+0/-2)
tests/functional/openlp_core/display/test_render.py (+111/-3)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/latest-fixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+372057@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-08-30.

Commit message

Undo an incorrect change and replace missing code as pert of the display revamp.

Description of the change

The save Button did not need renaming it has been moved by QT.

Replace the logic to set the theme for a given item.

Replace the theme regeneration code which was removed in the refactor.

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

JavaScript tests failed, please see https://ci.openlp.io/job/MP-02-JavaScript-Tests/4/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

See inline comments

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

JavaScript tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting failed, please see https://ci.openlp.io/job/MP-05-Linting/162/ for more details

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

JavaScript tests passed!

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

Linux tests passed!

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

macOS tests passed!

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

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) :
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.