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

13816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
6fa0f07e32 head 2016-04-03 20:07:09 +01:00
Tim Bentley
d7e2e0e839 remove import 2016-04-03 20:06:48 +01:00
chris@minkus.me.uk
5a3e5c655c Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key 
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests

--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...

bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
 2016-04-03 16:57:52 +01:00
ian@knightly.xyz
a0e004b68f Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check. 
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...

bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860, https://launchpad.net/bugs/1550856
 2016-04-03 16:55:55 +01:00
Tim Bentley
7424d6be8b More refactoring 
bzr-revno: 2635
 2016-04-03 16:54:13 +01:00
ian@knightly.xyz
dd0ef0a17c Adds support for importing ProPresenter 5 and 6 files. See branch description for further details. 
lp:~knightrider0xd/openlp/propresenter_5-6_import (revision 2634)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1271/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1210/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1044/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface...

bzr-revno: 2634
Fixes: https://launchpad.net/bugs/1358601
 2016-04-03 16:44:04 +01:00
alisonken1@gmail.com
4388ed5fbe "- Fix str.decode() exception when using -d option 
- Fix projector try...except block issues with Qt5
- Added test for projector receiving command INST data

[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1229/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1061/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/65..."

bzr-revno: 2633
 2016-04-03 17:20:19 +02:00
Chris Hill
33cbda294d Coding standards fixes 2016-04-03 12:14:17 +01:00
Chris Hill
ae394cf028 Minor fixes 2016-04-03 12:02:53 +01:00
Chris Hill
efb71b4f31 Merge w/ trunk 2016-04-03 11:58:35 +01:00
Chris Hill
38c9ed1fd0 Merge w/ trunk 2016-04-03 11:57:57 +01:00
Chris Hill
330a1758c8 Use get_natural_key instead of _natural_sort_key 2016-04-03 11:57:39 +01:00
Ken Roberts
6bca1fc455 Fix decode() string error in about text - fix qt try/except error in projector 2016-04-01 20:04:15 -07:00
suutari-olli
7ef33d4715 This branch changes icons for Preview and Replace Live background buttons. 
Currently preview button uses same icon as Blank to Theme and 
Replace Live background uses same icon as Blank to black.
This is problematic because these icons don’t describe these 
actions and may be confused with their other meanings.

Preview icon is replaced by system_mediamanager.png icon, which consists of 
frame and is easily distinguishable from blank to icons.

Replace Live background icon now uses Blank to theme icon. 
I feel like this describes it much better than “Blank to black”
 2016-04-01 21:59:51 +03:00
Tim Bentley
ec30c560a7 move tests and code 2016-04-01 18:28:40 +01:00
Tim Bentley
dbb07db257 fix PEP8 2016-04-01 18:15:45 +01:00
Tim Bentley
0678155400 fix PEP8 2016-04-01 18:09:47 +01:00
Tim Bentley
abd2c16ccd fix links 2016-04-01 18:02:14 +01:00
Tim Bentley
203c7b9dd8 move historycombo 2016-04-01 17:56:54 +01:00
Tim Bentley
cd77486e32 Start to refactor code structure 
bzr-revno: 2632
 2016-03-31 19:54:10 +01:00
Tim Bentley
2e58e45068 fixes more 2016-03-31 17:56:32 +01:00
Tim Bentley
cd239fe802 fixes 2016-03-31 17:47:42 +01:00
Tim Bentley
4362ff63f8 language manager 2016-03-31 17:42:42 +01:00
Tim Bentley
ba6d66497c actions 2016-03-31 17:34:22 +01:00
Tim Bentley
946d9ee3d5 fix tests 2016-03-31 17:24:44 +01:00
Tim Bentley
3693cf331d fix string in natural sort and move db 2016-03-31 17:14:28 +01:00
Ian Knight
184b0e538a Implemented recommended changes 2016-03-31 16:09:13 +10:30
Ian Knight
9516588f62 Housekeeping, pep8 errors 2016-03-31 03:50:33 +10:30
Ian Knight
573bc510ff Added ProPresenter 5 & 6 support 2016-03-31 03:41:52 +10:30
Tomas Groth
fa282cd103 pep8 fix 2016-03-29 22:45:57 +02:00
Tomas Groth
147e142d3f Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. 
Fixes: https://launchpad.net/bugs/1553863
 2016-03-29 22:34:50 +02:00
Chris Hill
8de2f013eb merge w/ trunk 2016-03-28 12:52:59 +01:00
Tomas Groth
8442ec0b5b Set progress bar steps to number of chapters. 2016-03-25 20:33:26 +01:00
Ian Knight
1667363abd Shifted common test code into setup. 2016-03-24 00:44:37 +10:30
Tomas Groth
12a8481e14 Use standard button text in the FTW, if possible. Fixes bug 1554554. 
Fixes: https://launchpad.net/bugs/1554554
 2016-03-23 12:55:54 +01:00
Tomas Groth
dc0924fbbb Translation fixes. Fixes bug 1545072 
Fixes: https://launchpad.net/bugs/1545072
 2016-03-22 22:11:12 +01:00
Tomas Groth
7c6e1902c4 Fix tag detection. Fixes bug 1549549. 
Fixes: https://launchpad.net/bugs/1549549
 2016-03-22 22:08:56 +01:00
second@tgc.dk
b74221daff Add support for importing OPS Pro song DB. Translations are supported using a {translation} tag. 
Fix bug that prevents song book entries to be imported.

bzr-revno: 2631
 2016-03-22 17:45:23 +00:00
Tim Bentley
73358f80e8 Refactor remote to use directories 
bzr-revno: 2630
 2016-03-22 17:44:17 +00:00
Ian Knight
a98e62ed5d Corrected comments 2016-03-21 16:11:46 +10:30
Tomas Groth
66cea24673 some more fixes 2016-03-20 21:23:01 +01:00
Ian Knight
80a8abf4d0 Merged changes from trunk 2016-03-21 01:30:15 +10:30
Ian Knight
4980465f98 Cleaned pep8 errors 2016-03-21 01:14:00 +10:30
Ian Knight
4f1a074546 Cleaned pep8 errors 2016-03-21 01:04:52 +10:30
Tomas Groth
45b122f768 make stuff prettier... 2016-03-20 09:28:41 +01:00
Tomas Groth
dca65148c4 forgot to add a file and made some pep8 fixes 2016-03-19 21:42:59 +01:00
Tomas Groth
2937f39999 trunk 2016-03-19 21:30:12 +01:00
Tomas Groth
b20eaef054 fix bug that prevents song book entries to be imported. 2016-03-19 21:28:32 +01:00
Tomas Groth
7941d8e2a1 improved copyright text handling and restructed a bit. 2016-03-19 21:27:49 +01:00
Tim Bentley
adeee5b20a remove extra dec 2016-03-19 19:42:10 +00:00