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

15727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill
8de2f013eb merge w/ trunk 2016-03-28 12:52:59 +01:00
Tomas Groth
663fef79bd trunk 2016-03-25 22:35:37 +01:00
Tomas Groth
6b75148e34 Disable importer if pysword is missing. Pep8 fixes. 2016-03-25 20:58:43 +01:00
Tomas Groth
8442ec0b5b Set progress bar steps to number of chapters. 2016-03-25 20:33:26 +01:00
Tomas Groth
a86ef7e4d5 import both OT and NT... 2016-03-25 20:28:33 +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
Tomas Groth
c9a8e2cf59 trunk 2016-03-22 15:14:16 +01:00
Tomas Groth
2c8e0b4dfa update year 2016-03-22 15:13:59 +01:00
Ian Knight
a98e62ed5d Corrected comments 2016-03-21 16:11:46 +10:30
Tomas Groth
1f9478208e trunk 2016-03-20 21:37:05 +01:00
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
Tim Bentley
ec0379ea44 Refactor 2016-03-19 18:49:55 +00:00
Chris Hill
2feedf6f38 coding standards fix 2016-03-19 16:01:23 +00:00
Chris Hill
5e33c05080 coding standards fix 2 2016-03-19 16:00:35 +00:00
Chris Hill
3db138ea8d coding standards fix 2016-03-19 15:50:56 +00:00
Chris Hill
9c5da3d196 merge w/ trunk 2016-03-19 15:09:50 +00:00
Chris Hill
bb0adc6f5d fixed bug #1280295 'Enable natural sorting for song book searches', refactored to move filtering to database, updated test 
Fixes: https://launchpad.net/bugs/1280295
 2016-03-19 15:01:10 +00:00
Ian Knight
79b4c474d6 Added testing 2016-03-19 19:10:11 +10:30
Tomas Groth
7b69634552 Fixes for translation support + test 2016-03-19 07:20:12 +01:00
Tomas Groth
fdc22b4e4c Add translations support 2016-03-18 23:09:49 +01:00
Tomas Groth
302fcb221b Added another OPS Pro import test 2016-03-16 22:28:29 +01:00
suutari-olli
dd70dbe515 Changed word order from "show nothing default" to "default show nothing" to better match other settings in the set. 2016-03-16 19:37:54 +02:00
ian@knightly.xyz
dc6a9b6d86 Added single click preview for service manager (see attached blueprint) 
- Checkbox appears in advanced settings tab.
- When enabled, items will be sent to preview when clicked in service manager, but NOT if double-clicked.

bzr-revno: 2629
Fixes: https://launchpad.net/bugs/1536809
 2016-03-15 22:34:58 +01:00
second@tgc.dk
6738d936cd Fix slide order change when splitting custom slides. Fixes bug 1554748. 
Fix EasyWorship import issues with missing verses and traceback on unknown chars.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Pep8 fixes

bzr-revno: 2628
Fixes: https://launchpad.net/bugs/1547234, https://launchpad.net/bugs/1553922, https://launchpad.net/bugs/1554428, https://launchpad.net/bugs/1554748
 2016-03-15 22:32:10 +01:00
alisonken1@gmail.com
678e6d342d Spelling - Add plural "projectors" to multiple-selected projector tooltip descriptions 
String Standards  - Add period after tooltip descriptions
Tests - Added projector status_change test

bzr-revno: 2627
 2016-03-15 22:24:38 +01:00
suutari-olli
432c7a6380 Visual ident pep8 fix. 
If there are other's after this, they are part of trunk?
 2016-03-15 22:12:37 +02:00
suutari-olli
a73c42ac34 Added: "Do not show anything on startup" as an option for disabling default image and background. 
(By default OpenLP logo and white bg color are shown on primary Live monitor
(At the moment it's only possible to change the color/image but not disable them.)
 2016-03-15 21:39:51 +02:00
suutari-olli
87cdde1575 Merging trunk on 15/3/16 2016-03-15 21:14:40 +02:00
suutari-olli
4a6b5b7cc4 In this merge: 
- Moved setting for controlling unblanking behaviour to General options tab.
- Removed it from  advanced tab
- Changed default setting to "no"
- Looped playback (once or to end) is now linked to this setting
- Unblanking slides on click -.- no longer unblanks display when sending new items live if
  "Unblank display when sending new item to live" is not enabled. -.-
- Doubleclicking preview -.- ^^
- Improved some comments

To do:
Test(s)?
 2016-03-15 20:37:55 +02:00
suutari-olli
59cb9306c4 Copied resources.py from trunk to revert new changes 
I have a feeling this might not work as intended....
 2016-03-15 19:13:35 +02:00
suutari-olli
ddae0b4247 Removed duplicate: self.on_hide_display(True) 
(Was trying to create/test a test but failed and forgot to take it away)
 2016-03-15 16:11:24 +02:00
suutari-olli
a78565568f Pep8 fixes 
To do:
Test(s)
 2016-03-15 12:30:37 +02:00
suutari-olli
0c23135304 - Removed Whites space before (self, item) on row 789, how did it get there in the first place? 2016-03-15 11:39:54 +02:00
suutari-olli
546ed56823 - If display is blanked when song in Live is edited, now re-blanks display after updating the song. (Improved fix) 
- Improved un-blanking when starting Loop, pressing "Stop loop" no longer unblanks display.
- Improved comment(s)

To do:
- Write test(s)
 2016-03-14 04:11:13 +02:00
Tomas Groth
e908799240 Fix slide order change when splitting custom slides. Fixes bug 1554748. 
Fixes: https://launchpad.net/bugs/1554748
 2016-03-13 22:55:47 +01:00
Tomas Groth
faa434d937 pep8 fixes 2016-03-13 19:37:08 +01:00