Commit Graph

1769 Commits

Author SHA1 Message Date
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text.
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
2016-05-12 23:00:54 +02:00
Ken Roberts c58ce31e8b "Convert __init__.py file strings from python2 to python3 format
Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

bzr-revno: 2658
2016-05-12 22:34:57 +02:00
Ken Roberts 9ac95cf665 Skip crosswalk.com test while server down 2016-05-05 12:37:48 -07:00
Ken Roberts 72fc30d600 merge trunk 2016-05-05 08:51:07 -07:00
Tomas Groth 17fa45b1dd Added tests. 2016-05-04 22:58:44 +02:00
Tim Bentley 0efd1931b4 head 2016-05-02 09:05:47 +01:00
Ken Roberts e42c6a9071 - Convert strings in mainwindow.py
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

bzr-revno: 2656
2016-05-02 06:49:54 +01:00
Tim Bentley 38cd4b1f67 with tests 2016-04-30 18:12:40 +01:00
Ken Roberts 956c9d1653 pep8 in test_openlpimporter.py 2016-04-29 13:35:54 -07:00
Ken Roberts 5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
Samuel Mehrbrodt 9cd49f194f PEP8 2016-04-29 19:32:09 +02:00
Samuel Mehrbrodt 868b538dd2 Fix test and add new one 2016-04-29 19:10:50 +02:00
raoul@snyman.info 1744032383 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

bzr-revno: 2654
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 22:44:03 +01:00
Raoul Snyman 60f3ae195c Forgot to add the test file 2016-04-27 23:23:16 +02:00
ian@knightly.xyz f4697a6051 Added QR code and link to iOS remote app and test to HTML Builder.
lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

bzr-revno: 2653
2016-04-27 17:57:34 +01:00
Tomas Groth 58ac52a30e merge trunk 2016-04-26 20:58:03 +02:00
Ian Knight 56f5bbac52 Testing 2016-04-26 12:17:38 +09:30
Ian Knight b8173f7f0e Added Test to HTML Builder 2016-04-26 12:13:29 +09:30
Chris Hill bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Ken Roberts 884f060dea Oops and text in projector test 2016-04-24 04:22:04 -07:00
Ken Roberts d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
Ken Roberts 591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Ken Roberts 907e1df129 - Update string format to Python3 style
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

Convert string format from Python2
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

Jenkins down - local pep8 and tests (except windows tests) passed.

Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...

bzr-revno: 2650
2016-04-23 14:48:27 +01:00
Tim Bentley 071a4438e9 Finish moving things around
bzr-revno: 2649
2016-04-23 14:46:59 +01:00
Tim Bentley fed2466ad6 Add Icon and defense tests for missing mediainfo
bzr-revno: 2648
2016-04-23 14:45:55 +01:00
Ken Roberts c1222dc2bb Convert strings to python3 in __init__ files 2016-04-22 17:40:59 -07:00
Tim Bentley 37ea1c5da1 fix 2016-04-22 20:25:28 +01:00
Tim Bentley d9d31c4626 tests 2016-04-22 19:35:23 +01:00
Ken Roberts bec015142b Merge trunk to fix conflicts 2016-04-22 04:41:29 -07:00
suutari.olli@gmail.com f0d75a29c2 This branch introduces the following fixes/features:
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
  (Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
  be set if panels are locked.
- Panels are now locked by default, this prevents users from
  totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
  (By default disabled, added a hidden setting fo...

bzr-revno: 2647
Fixes: https://launchpad.net/bugs/1508582, https://launchpad.net/bugs/1565447
2016-04-21 22:16:24 +01:00
Tim Bentley 59b3c7b053 head 2016-04-21 17:27:04 +01:00
Tim Bentley bd8ddf7506 fix tests 2016-04-21 17:26:34 +01:00
gabriel.loo@gmail.com c3e27b44f0 Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).
bzr-revno: 2646
Fixes: https://launchpad.net/bugs/1570228
2016-04-21 17:03:36 +01:00
Tomas Groth 89ce4131e7 Skip pysword tests is pysword isn't installed. 2016-04-20 21:29:04 +02:00
Tim Bentley f2537981e4 update 2016-04-20 17:36:37 +01:00
suutari-olli a0859a5694 Noticed I had created 2 unneeded blank lines to test file. 2016-04-18 21:30:22 +03:00
suutari-olli 3639ad1bd4 Added two tests.
One to check projectors panel is set visible
after the wizard, the other for the opposite.
2016-04-18 20:18:04 +03:00
Gabriel Loo caa9c59c75 Added unit tests for SongSelect Importer search 2016-04-17 18:55:40 -04:00
Chris Hill 66fc2ff7c3 merge w/ trunk 2016-04-17 22:23:50 +01:00
Chris Hill 0c8f9e3b71 Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs 2016-04-17 22:22:30 +01:00
Tim Bentley 1942a8ac14 fix 2016-04-17 21:11:55 +01:00
Tim Bentley 760b34f35a fix 2016-04-17 20:42:14 +01:00
Tim Bentley bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley 34f00cda92 dnd and files 2016-04-17 20:09:46 +01:00
Tim Bentley 6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
Tim Bentley c2a2d8545e head 2016-04-17 19:49:22 +01:00
Tim Bentley 210cb0be31 head 2016-04-17 19:48:50 +01:00
Ken Roberts f6cb085b0d "- Update string format to Python3 style
- Added projector lamp values test

Convert string format from Python2 
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

bzr-revno: 2645
2016-04-17 17:33:08 +02:00
Ken Roberts 16ed511a93 Fix notes in multiple lamp test 2016-04-17 02:33:48 -07:00
Ken Roberts 1288da1b87 Added multiple lamp test 2016-04-17 02:30:30 -07:00