Merge lp://qastaging/~marmyshev/openlp/transitions into lp://qastaging/openlp
Proposed by
Dmitriy Marmyshev
Status: | Needs review | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~marmyshev/openlp/transitions | ||||||||||||
Merge into: | lp://qastaging/openlp | ||||||||||||
Diff against target: |
1690 lines (+885/-258) 14 files modified
openlp/core/common/settings.py (+2/-0) openlp/core/lib/__init__.py (+3/-1) openlp/core/lib/htmlbuilder.py (+431/-166) openlp/core/lib/json/theme.json (+2/-1) openlp/core/lib/renderer.py (+1/-1) openlp/core/lib/theme.py (+12/-5) openlp/core/lib/transitions.py (+138/-0) openlp/core/ui/maindisplay.py (+185/-57) openlp/core/ui/media/mediacontroller.py (+5/-3) openlp/core/ui/slidecontroller.py (+4/-12) openlp/core/ui/themeform.py (+27/-3) openlp/core/ui/themestab.py (+52/-0) openlp/core/ui/themewizard.py (+21/-3) tests/functional/openlp_core_lib/test_htmlbuilder.py (+2/-6) |
||||||||||||
To merge this branch: | bzr merge lp://qastaging/~marmyshev/openlp/transitions | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Preikschat (community) | Needs Information | ||
Review via email:
|
This proposal supersedes a proposal from 2015-04-14.
Description of the change
New transition system. New effects, added transitions for background, images and blanking.
no tests.
just to review all changes.
To post a comment you must log in.
Unmerged revisions
- 2198. By Dmitriy Marmyshev
-
Trunk
- 2197. By Dmitriy Marmyshev
-
transition speed storage in global settings and in theme file.
- 2196. By Dmitriy Marmyshev
-
fixed blanking transitions, replace background by image
- 2195. By Dmitriy Marmyshev
-
refactor params for build_html_
display( ). clear current_frame html after effect. - 2194. By Dmitriy Marmyshev
-
TRUNK
- 2193. By Dmitriy Marmyshev
-
cleanup
- 2192. By Dmitriy Marmyshev
-
remove extra line above text
- 2191. By Dmitriy Marmyshev
-
fixed cross-fade effect
- 2190. By Dmitriy Marmyshev
-
refactor logo image on live screen
- 2189. By Dmitriy Marmyshev
-
fixed issue with blanking
- You mentioned images... I do not see a transiton between images. Is that supposed to be like that?
- Did you consider the transition speeds? To me they appear a bit too fast. (I somehow don't really like them... but maybe this is just my taste.)