Merge lp://qastaging/~oliwee/openlp/newtransition into lp://qastaging/openlp
Proposed by
Oliver Wieland
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~oliwee/openlp/newtransition |
Merge into: | lp://qastaging/openlp |
Diff against target: |
525 lines (+208/-34) 7 files modified
openlp/core/lib/htmlbuilder.py (+83/-17) openlp/core/lib/json/theme.json (+1/-0) openlp/core/lib/theme.py (+36/-2) openlp/core/ui/themeform.py (+13/-1) openlp/core/ui/themewizard.py (+14/-2) tests/functional/openlp_core_lib/test_htmlbuilder.py (+59/-11) tests/functional/openlp_core_lib/test_theme.py (+2/-1) |
To merge this branch: | bzr merge lp://qastaging/~oliwee/openlp/newtransition |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenLP Core | Pending | ||
Review via email:
|
Description of the change
Added a second type of transition, which is more a crossfade than a fade-out-
Added / adapted tests for htmlbuilder to match the new html code
To post a comment you must log in.
Unmerged revisions
- 2494. By Oliver Wieland
-
fixed test_theme
adapted to new count of theme variables
added assert for new variable - 2493. By Oliver Wieland
-
merged actual trunk
- 2492. By Oliver Wieland
-
Fixed problems with vertical align
Fixed tests - 2491. By Oliver Wieland
-
Inserted a combo box into theme manager to select transition type
Tests for htmlbuilder adapted (not ready) - 2490. By Oliver Wieland
-
new Transition between slides
Hey Oliver,
Are you still interested in adding this feature to OpenLP? Trunk is open for code, and it would be great to have more transitions.