Merge lp:~knightrider0xd/openlp/non-text-item-height-default into lp:openlp
Status: | Merged |
---|---|
Approved by: | Tim Bentley |
Approved revision: | 2674 |
Merged at revision: | 2674 |
Proposed branch: | lp:~knightrider0xd/openlp/non-text-item-height-default |
Merge into: | lp: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:~knightrider0xd/openlp/non-text-item-height-default |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Review via email: mp+296308@code.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:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
Got this when I started OpenLP.
Traceback (most recent call last): raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/__ init__. py", line 392, in main exit(applicatio n.run(qt_ args)) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/__ init__. py", line 142, in run ).execute( 'bootstrap_ initialise' ) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/common/ registry. py", line 137, in execute raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/lib/ pluginmanager. py", line 68, in bootstrap_ initialise initialise_ plugins( ) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/lib/ pluginmanager. py", line 183, in initialise_plugins initialise( ) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ plugins/ media/mediaplug in.py", line 66, in initialise ).initialise( ) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/lib/ plugin. py", line 277, in initialise media_item. initialise( ) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ plugins/ media/lib/ mediaitem. py", line 303, in initialise load_list( Settings( ).value( self.settings_ section + '/media files')) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ plugins/ media/lib/ mediaitem. py", line 368, in load_list name.setToolTip ('%s@%s- %s' % (file_name, format_ milliseconds( start), format_ milliseconds( end))) raoul/Projects/ OpenLP/ OpenLP/ non-text- item-height- default/ openlp/ core/ui/ media/_ _init__ .py", line 143, in format_milliseconds
File "./openlp.py", line 44, in <module>
main()
File "/home/
sys.
File "/home/
Registry(
File "/home/
result = function(*args, **kwargs)
File "/home/
self.
File "/home/
plugin.
File "/home/
super(
File "/home/
self.
File "/home/
self.
File "/home/
item_
File "/home/
millis=millis)
ValueError: Unknown format code 'd' for object of type 'float'