lp:~suutari-olli/openlp/show-no-logo-or-background-when-starting

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2643

Raoul Snyman: Approve on 2016-04-16

Tim Bentley: Approve on 2016-04-13

Diff: 402 lines (+130/-78)

6 files modified

openlp/core/common/settings.py (+6/-3)
openlp/core/common/uistrings.py (+1/-0)
openlp/core/ui/advancedtab.py (+2/-69)
openlp/core/ui/generaltab.py (+75/-2)
openlp/core/ui/maindisplay.py (+5/-3)
tests/functional/openlp_core_ui/test_maindisplay.py (+41/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1512038: Disable default image background, show desktop

Wishlist

Fix Committed

Link a bug report

Related blueprints

2643. By Azaziah on 2016-04-13

Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628

2642. By Azaziah on 2016-04-12

Merge to trunk on 13.4.16

2641. By Azaziah on 2016-04-08

Fixed the broken import statements.

2640. By Azaziah on 2016-04-08

Merge to trunk on 8.4.16

You will need to
manually delete the __pycache__ directory inside openlp_core_utils.
run "bzr resolve openlp_core_utils"
then you will be allowed to commit the changes.

also resolved conflict for advancedtab.py

2639. By Azaziah on 2016-04-08

This now moves old settings from advanced tab into the new settings.

2638. By Azaziah on 2016-04-01

- Changed comments related to "default image" to match "logo".
- Removed one default_

2637. By Azaziah on 2016-04-01

Added empty newline to the end of generaltab.py

2636. By Azaziah on 2016-04-01

In this branch:

- Removed old "Default image" settings from advanced tab.
- Removed related imports and functions.
- Renamed def on_background_color_changed to on_logo_background_color_changed

2635. By Azaziah on 2016-04-01

In this branch:

- Renamed "Default image" and related settings to "Logo" etc.
- Moved these settings to General tab from Advanced tab
- Re-wired these settings to code functions

To do:

- Remove these from advanced tab.
- Verify tests still work

2634. By Azaziah on 2016-03-31

Added two tests for this.

The other to check if visibility is changed to "True" for logo, the other for the opposite.

To do:

How to name this new setting? / Old "Default image" settings.