Commit Graph

14070 Commits

Author SHA1 Message Date
Ian Knight
bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Tomas Groth
17fa45b1dd Added tests. 2016-05-04 22:58:44 +02:00
Tomas Groth
166b222765 trunk 2016-05-04 22:05:46 +02:00
Ian Knight
a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight
f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
Tim Bentley
51613fd32d fix strings 2016-05-02 09:12:39 +01:00
Tim Bentley
0efd1931b4 head 2016-05-02 09:05:47 +01:00
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
6d7039ed41 minor fixes 2016-04-30 18:19:55 +01:00
Tim Bentley
38cd4b1f67 with tests 2016-04-30 18:12:40 +01:00
Tim Bentley
162f1ecbe9 remove old loop 2016-04-30 16:49:06 +01:00
Tim Bentley
c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
Tim Bentley
8094cd051a head 2016-04-30 10:35:54 +01:00
Tim Bentley
6158a0672c background videos 2016-04-30 10:34:37 +01:00
Tomas Groth
b7a32ebbb2 Added support for using the new mutool in mudraw mode 2016-04-30 11:05:10 +02:00
956c9d1653 pep8 in test_openlpimporter.py 2016-04-29 13:35:54 -07:00
5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
s.mehrbrodt@gmail.com
655172df60 Fix performance regression with Songbook search
The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

bzr-revno: 2655
Fixes: https://launchpad.net/bugs/1552563
2016-04-29 19:40:32 +01: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
Samuel Mehrbrodt
30dc1bd2eb Unused import 2016-04-29 18:44:24 +02:00
Samuel Mehrbrodt
48c5737bd1 Fix comment 2016-04-29 18:43:14 +02:00
Samuel Mehrbrodt
d636461cbb Fix performance in songbook search
Speedup by ~500%

Fixes: https://launchpad.net/bugs/1552563
2016-04-29 18:30:17 +02:00
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
60f3ae195c Forgot to add the test file 2016-04-27 23:23:16 +02:00
7262345912 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:58:35 +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
second@tgc.dk
69b3cd34d3 Added support for importing SWORD bibles using PySword.
bzr-revno: 2652
Fixes: https://launchpad.net/bugs/785625
2016-04-27 17:56:58 +01:00
d3d6e6c620 Missed translate() string format 2016-04-27 05:49:55 -07:00
Tomas Groth
72c435633c fix merge issues 2016-04-26 21:04:22 +02:00
Tomas Groth
58ac52a30e merge trunk 2016-04-26 20:58:03 +02:00
chris@minkus.me.uk
b43349e3ea Natural sort for authors, topics, songbooks, themes in Edit Song comboboxen & Song Maintenance form, as mentioned previously by Raoul - Matthew 21:28–29! :)
Also some minor fixes that I picked up after merge 2637 for natural sorting:
x Author, Topics, Theme search were performing two sorts (one database sort, then a natural sort in code). Removed the first database sort.
x Changed all sorting to use in-place sort() rather than copy sorted(), as apparently there's a speed bonus (http://stacko...

bzr-revno: 2651
2016-04-26 17:07:18 +01: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
a5cd1e15bc resolve pep8 W293 warning 2016-04-25 12:01:32 +01:00
Chris Hill
bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Chris Hill
1e9b7148f5 Resolve pep8 errors - separate def, two line split 2016-04-25 11:53:20 +01:00
884f060dea Oops and text in projector test 2016-04-24 04:22:04 -07:00
28e14012a8 Remove unneeded print statement 2016-04-24 04:04:32 -07:00
292606ba38 Fix translate() string format and some missed conversions 2016-04-23 14:38:43 -07:00
3e0769d946 Fix extraneous print() in media plugin 2016-04-23 14:12:28 -07:00
d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Tomas Groth
ebaf99f4fb Fix traceback 2016-04-23 20:33:53 +02:00
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
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
f2784decc7 fix 2016-04-22 20:04:17 +01:00