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

13973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill
743a916292 merge w/ trunk 2016-04-08 12:53:54 +01:00
Tim Bentley
483c12d779 vlc tests pass 2016-04-07 19:14:10 +01:00
Tim Bentley
189dc95bbf fix up tests 2016-04-07 19:01:16 +01:00
Tomas Groth
489321316f Made a exception catch more specific. 2016-04-06 23:14:23 +02:00
Tim Bentley
a41d86cb7c Head 2016-04-06 06:08:44 +01:00
Tim Bentley
a56f851794 Remove utils and move code to common and lib dirs, fix up tests and broken tests 
bzr-revno: 2638
 2016-04-06 05:58:51 +01:00
Tim Bentley
7f1f8cf780 pep8 2016-04-05 21:14:50 +01:00
Tim Bentley
31a2b37a88 pep8 2016-04-05 21:07:57 +01:00
Tim Bentley
59e3603a3e fix tests 2016-04-05 20:58:40 +01:00
Tim Bentley
1082254f02 fix tests 2016-04-05 20:51:46 +01:00
Tim Bentley
3500c73494 fix tests 2016-04-05 20:44:00 +01:00
Tim Bentley
b6c49450d4 fix tests 2016-04-05 20:33:37 +01:00
Tim Bentley
fb2de75cbc fix tests 2016-04-05 20:11:10 +01:00
Tim Bentley
7c88006c7b fix tests 2016-04-05 19:44:50 +01:00
Tim Bentley
1725518088 delete directory 2016-04-05 19:34:08 +01:00
Tim Bentley
6729ea9d19 move file 2016-04-05 19:33:50 +01:00
Tim Bentley
2df1169ea8 fix tests 2016-04-05 19:11:42 +01:00
Chris Hill
74497b9229 Implement natural sort for authors, topics, songbooks, themes in Edit Song comboboxen, Song Maintenance form 2016-04-05 18:55:22 +01:00
Tim Bentley
3e8e72be85 move methods and clean up 2016-04-05 18:30:20 +01:00
Tim Bentley
b7da0be71e move method 2016-04-05 18:10:51 +01:00
Tim Bentley
f19280c88d move method 2016-04-05 17:58:29 +01:00
Tim Bentley
6dcd4b54d9 fix import issues 2016-04-05 17:43:55 +01:00
Tim Bentley
cfc3a978a8 fix import issues 2016-04-05 17:34:21 +01:00
Tim Bentley
3e8af699c3 fix import issues 2016-04-04 22:19:37 +01:00
Tim Bentley
d440891819 fix import 2016-04-04 22:11:23 +01:00
Tim Bentley
ee62d9fa6c change package 2016-04-04 22:01:24 +01:00
Tim Bentley
0b480f5e8d add test mixin 2016-04-04 21:47:33 +01:00
Tim Bentley
8a1b62fdcd move tests 2016-04-04 21:41:08 +01:00
Tim Bentley
5dd4b8e386 Pep8 2016-04-04 21:27:33 +01:00
Tim Bentley
85587ce2f3 uno commands 2016-04-04 21:14:04 +01:00
Tim Bentley
98a021b89f Pep8 2016-04-04 21:03:19 +01:00
Tim Bentley
dffba47b44 move version checker 2016-04-04 20:53:54 +01:00
Chris Hill
abc25744a2 Remove second sort from author, topic, theme search, change all sorting from sorted() to sort() 2016-04-03 22:20:40 +01:00
suutari-olli
9ec22c1b11 Generated the resources file. 2016-04-03 22:51:59 +03:00
Tim Bentley
a0bfc7d069 move methods 2016-04-03 20:44:09 +01:00
suutari-olli
6ad51f2b0b Added new icon for Preview. (Provided by superfly) 2016-04-03 22:12:37 +03:00
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