raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
13,959 Commits 5 Branches 0 Tags 296 MiB
bd9c9a8430
Commit Graph

13959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
suutari-olli
bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
suutari-olli
e4bce11a03 Commiting for merging trunk, some new changes. 2016-05-10 03:53:14 +03:00
second@tgc.dk
e76652762c Added support for detected the new version of mutool which now contains the functionality of mudraw. 
Improve mediainfo detection on windows and mac.
Fix crosswalk bible list download.

bzr-revno: 2657
Fixes: https://launchpad.net/bugs/1579648
 2016-05-09 21:34:18 +02:00
Tomas Groth
fa9a29d303 Fix crosswalk bible list download 2016-05-06 07:33:43 +02:00
Tomas Groth
7ee0af01b2 fix traceback if bible list download fails. 2016-05-05 22:30:00 +02:00
Tomas Groth
26e72a1fec make mediainfo detection work on win and mac. 2016-05-05 20:17:45 +02:00
Tomas Groth
907282d3cd make mudraw/mutool detection work on mac 2016-05-05 20:14:33 +02:00
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
alisonken1@gmail.com
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
Tomas Groth
b7a32ebbb2 Added support for using the new mutool in mudraw mode 2016-04-30 11:05:10 +02: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
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
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
Raoul Snyman
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
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
Tomas Groth
ebaf99f4fb Fix traceback 2016-04-23 20:33:53 +02:00
alisonken1@gmail.com
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
Tim Bentley
37ea1c5da1 fix 2016-04-22 20:25:28 +01:00
Tim Bentley
f2784decc7 fix 2016-04-22 20:04:17 +01:00
Tim Bentley
d9d31c4626 tests 2016-04-22 19:35:23 +01:00
Tim Bentley
123a7f02a7 yet more files 2016-04-22 19:32:59 +01:00
Tim Bentley
0d755e3354 more files 2016-04-22 19:32:45 +01:00
Tim Bentley
38996c81cc more files 2016-04-22 19:25:57 +01:00
Tim Bentley
20acc90951 Pep8 2016-04-22 17:37:21 +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