lp:~thelinuxguy/openlp/fix-1490184

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2591

Tomas Groth: Approve on 2016-01-06

Tim Bentley: Approve on 2016-01-05

Diff: 752 lines (+174/-53)

35 files modified

.bzrignore (+2/-0)
openlp/core/ui/aboutform.py (+3/-2)
openlp/core/ui/exceptionform.py (+2/-1)
openlp/core/ui/filerenameform.py (+3/-2)
openlp/core/ui/firsttimelanguageform.py (+3/-2)
openlp/core/ui/formattingtagform.py (+3/-2)
openlp/core/ui/pluginform.py (+3/-2)
openlp/core/ui/printserviceform.py (+2/-1)
openlp/core/ui/projector/editform.py (+2/-1)
openlp/core/ui/projector/sourceselectform.py (+4/-2)
openlp/core/ui/serviceitemeditform.py (+3/-2)
openlp/core/ui/servicenoteform.py (+3/-2)
openlp/core/ui/settingsform.py (+2/-1)
openlp/core/ui/shortcutlistform.py (+2/-1)
openlp/core/ui/starttimeform.py (+3/-2)
openlp/plugins/alerts/forms/alertform.py (+2/-1)
openlp/plugins/bibles/forms/booknameform.py (+2/-1)
openlp/plugins/bibles/forms/editbibleform.py (+3/-2)
openlp/plugins/bibles/forms/languageform.py (+3/-1)
openlp/plugins/custom/forms/editcustomform.py (+3/-2)
openlp/plugins/custom/forms/editcustomslideform.py (+3/-2)
openlp/plugins/images/forms/addgroupform.py (+3/-2)
openlp/plugins/images/forms/choosegroupform.py (+3/-2)
openlp/plugins/media/forms/mediaclipselectorform.py (+2/-1)
openlp/plugins/songs/forms/authorsform.py (+3/-2)
openlp/plugins/songs/forms/editsongform.py (+2/-1)
openlp/plugins/songs/forms/editverseform.py (+3/-2)
openlp/plugins/songs/forms/mediafilesform.py (+2/-1)
openlp/plugins/songs/forms/songbookform.py (+3/-2)
openlp/plugins/songs/forms/songmaintenanceform.py (+2/-1)
openlp/plugins/songs/forms/songselectform.py (+2/-1)
openlp/plugins/songs/forms/topicsform.py (+3/-2)
openlp/plugins/songusage/forms/songusagedeleteform.py (+3/-2)
openlp/plugins/songusage/forms/songusagedetailform.py (+3/-2)
tests/functional/openlp_plugins/songs/test_songformat.py (+84/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1490184: ‘?’ help buttons not working

Low

Fix Released

Link a bug report

Related blueprints

2590. By Simon Hanna on 2016-01-05

Add docstrings to tests

2589. By Simon Hanna on 2016-01-02

Add documentation to tests

2588. By Simon Hanna on 2015-12-30

Add tests for the SongFormat class

2587. By Simon Hanna on 2015-12-30

Update forms to remove the help button in the statusbar

2586. By Raoul Snyman on 2015-12-28

Release 2.3.1

2585. By Jonathan Springer on 2015-12-28

"Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused"

2584. By Jonathan Springer on 2015-12-28

"Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt.
Display keyboard shortcuts with modifiers in their platform native form."

2583. By Tomas Groth on 2015-12-27

"Only import vlc in one place. Make it work with PyInstaller.
Added bit-install-hint for VLC
Pep8 fixes

"

2582. By Andreas Preikschat on 2015-12-26

The .desktop file was missing a comment. The comment might be displayed (depending on your DE/VW).

2581. By Andreas Preikschat on 2015-12-26

I updated vlc.py from upstream since it last has been update in 2014.