OpenLP

Merge lp://qastaging/~knightrider0xd/openlp/non-text-item-height-default into lp://qastaging/openlp

  1. non-text-item-height-default
  2. Merge into trunk
Proposed by Ian Knight
Status: Merged
Approved by: Tim Bentley
Approved revision: 2674
Merged at revision: 2674
Proposed branch: lp://qastaging/~knightrider0xd/openlp/non-text-item-height-default
Merge into: lp://qastaging/openlp
Diff against target: 252 lines (+111/-19)
7 files modified
openlp/core/common/settings.py (+1/-1)
openlp/core/ui/advancedtab.py (+18/-9)
openlp/core/ui/lib/listpreviewwidget.py (+18/-7)
tests/functional/openlp_core_common/test_registryproperties.py (+0/-1)
tests/functional/openlp_core_ui_lib/test_listpreviewwidget.py (+73/-0)
tests/functional/openlp_plugins/bibles/test_lib.py (+1/-0)
tests/functional/openlp_plugins/songs/test_opsproimport.py (+0/-1)
To merge this branch: bzr merge lp://qastaging/~knightrider0xd/openlp/non-text-item-height-default
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+296308@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-06-02.

Description of the change

Adds automatic functionality to the max-height for non-text items feature, and sets this as the default value.
Advanced tab spin box replaced with combo box.

Test coverage expanded on other functions in listpreviewwidget and pep8 errors fixed.
Fixed test naming.
Merged with trunk as of 2016-06-02_10:30.

lp:~knightrider0xd/openlp/non-text-item-height-default (revision 2674)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1584/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1495/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1212/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/802/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/870/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/738/

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

Got this when I started OpenLP.

Traceback (most recent call last):
  File "./openlp.py", line 44, in <module>
    main()
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/__init__.py", line 392, in main
    sys.exit(application.run(qt_args))
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/__init__.py", line 142, in run
    Registry().execute('bootstrap_initialise')
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/common/registry.py", line 137, in execute
    result = function(*args, **kwargs)
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/lib/pluginmanager.py", line 68, in bootstrap_initialise
    self.initialise_plugins()
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/lib/pluginmanager.py", line 183, in initialise_plugins
    plugin.initialise()
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/plugins/media/mediaplugin.py", line 66, in initialise
    super().initialise()
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/lib/plugin.py", line 277, in initialise
    self.media_item.initialise()
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/plugins/media/lib/mediaitem.py", line 303, in initialise
    self.load_list(Settings().value(self.settings_section + '/media files'))
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/plugins/media/lib/mediaitem.py", line 368, in load_list
    item_name.setToolTip('%s@%s-%s' % (file_name, format_milliseconds(start), format_milliseconds(end)))
  File "/home/raoul/Projects/OpenLP/OpenLP/non-text-item-height-default/openlp/core/ui/media/__init__.py", line 143, in format_milliseconds
    millis=millis)
ValueError: Unknown format code 'd' for object of type 'float'

review: Needs Fixing
Revision history for this message
Ian Knight (knightrider0xd) wrote : Posted in a previous version of this proposal

Hey superfly.
I can't replicate this bug, and looking at that trace, it appears to be related to something in media, not my changes.

Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

This code is existing and connected to CD /dvd items in media.
Did you have some media items created and then take to cd / dvd out of the machine?

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

I figured this out, it's a bug in Ken's new formatting code. I've fixed it.

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

Please just merge trunk into your branch and resubmit? Thanks.

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

Sorry, just spotted this. Your tests are incorrectly named, and won't be picked up by the test runner (especially when we move to nose2).

review: Needs Fixing
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.