raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
12,987 Commits 5 Branches 0 Tags 296 MiB
4fb55448f8
Commit Graph

9891 Commits

Author SHA1 Message Date
Tim Bentley
93038bb27d Move delete option to support ham fisted users 
bzr-revno: 2492
 2015-02-01 13:37:54 +00:00
Phill Ridout
6d2b1d958e Better handle failed downloads 2015-01-31 21:52:02 +00:00
Ken Roberts
93ce2caf34 Fix invalid call to QMessageBox() when user wants to delete user-defined source text. 
bzr-revno: 2491
 2015-01-31 14:18:19 +00:00
Tomas Groth
cf9c91f171 Fix parsing of partly broken presentation manager files on windows. 2015-01-30 21:50:36 +00:00
Tim Bentley
6f76c164e0 fix delete 2015-01-30 21:15:03 +00:00
Phill Ridout
cdafe89624 Change fileName to file_name 2015-01-30 21:03:53 +00:00
Phill Ridout
59088887fc PEP Fixes 2015-01-29 21:21:03 +00:00
Tomas Groth
46ee502ad6 Fix for chardet input. 2015-01-29 21:20:36 +00:00
Tomas Groth
1b75cc9c6b Fallback to manual encoding detection. 2015-01-29 21:15:39 +00:00
Phill Ridout
0e79c0fe40 Remove testing code 2015-01-29 20:58:14 +00:00
Phill Ridout
b33fe701df Make Phonon optional 
Fixes: https://launchpad.net/bugs/1224404
 2015-01-29 20:57:02 +00:00
Phill Ridout
84dfb24674 pep fix 2015-01-29 18:28:00 +00:00
Tomas Groth
8e8228a69a Make xml parsing of presentation manager files recover if errors are encountered. Fixes bug 1414980. 
Fixes: https://launchpad.net/bugs/1414980
 2015-01-29 15:06:44 +01:00
Phill Ridout
3fcccd70e4 Fixes thumbnails in stage view 2015-01-28 20:41:42 +00:00
Phill Ridout
0cc2ae5998 Fix exception raised on mac 
Fixes: https://launchpad.net/bugs/1414360
 2015-01-27 19:57:09 +00:00
Tomas Groth
6668282fde Set the cursor back to normal after deleting a presentation. Fixes bug 1414978. 
Fixes: https://launchpad.net/bugs/1414978
 2015-01-27 15:59:06 +01:00
Tomas Groth
10d25f8173 Added a cancel-button to FTW when no internet is available. Fixes bug 1410738 
Fixes: https://launchpad.net/bugs/1410738
 2015-01-27 15:52:18 +01:00
Tomas Groth
6a7da2ade1 Fix support for 'end' mark in bible-search. Fixes bug 1412517. 
Fixes: https://launchpad.net/bugs/1412517
 2015-01-26 21:48:45 +00:00
Phill Ridout
bfe1824cb4 removed redundant code 2015-01-26 21:18:23 +00:00
Phill Ridout
2815bc46e3 typo 2015-01-26 21:04:29 +00:00
Phill Ridout
1712464e8c Fix up tests 2015-01-26 20:42:19 +00:00
Phill Ridout
28222ed0f8 fix check_available to work on feature detection 2015-01-25 22:00:14 +00:00
Tim Bentley
46f038a49d Release 2.1.2 
bzr-revno: 2488
 2015-01-24 19:21:07 +00:00
Philip Ridout
5390ed5bac Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail 
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)

Also added code to remove the old thumbnails.

bzr-revno: 2487
 2015-01-24 18:24:51 +00:00
Phill Ridout
14719b8ab3 remove print statments 2015-01-22 20:12:23 +00:00
Philip Ridout
fe3d887fd7 Corrects Translation strings 
bzr-revno: 2485
 2015-01-22 19:47:16 +00:00
Philip Ridout
c43823a2b0 Fixes the copyright headers 
bzr-revno: 2484
 2015-01-22 19:46:04 +00:00
Phill Ridout
92eee52d3f pep fixes 2015-01-22 18:07:56 +00:00
Phill Ridout
854537b3e6 PEP fix 2015-01-22 18:01:54 +00:00
Phill Ridout
051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout
75dff3d2be HEAD 2015-01-22 17:31:00 +00:00
Phill Ridout
833c6fb800 Add test 2015-01-22 15:05:03 +00:00
Phill Ridout
d6b8cd1d2a code tidies 2015-01-22 13:59:46 +00:00
Phill Ridout
7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Phill Ridout
7870cecd14 pep fixes 2015-01-22 13:19:10 +00:00
Philip Ridout
fa05d3110e Image Name in Service Manager - bug1410456 
bzr-revno: 2483
 2015-01-21 21:12:30 +00:00
Tomas Groth
f53187e26a Fix layout in player-settings. Fixes bug 1410772 
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.

bzr-revno: 2482
 2015-01-21 20:35:36 +00:00
Phill Ridout
88684425da spelling 2015-01-20 22:43:38 +00:00
Phill Ridout
4d749a89ac Presentation fixes 2015-01-20 21:56:05 +00:00
Phill Ridout
7fda8043f5 Improve translation string 
Fixes: https://launchpad.net/bugs/1412234
 2015-01-20 21:38:34 +00:00
Phill Ridout
e3f147a226 Fixes 1410456 and adds a couple tests 
Fixes: https://launchpad.net/bugs/1410456
 2015-01-19 22:49:18 +00:00
Ken Roberts
745a3e3ef8 Remove translations from error code number strings 2015-01-19 14:36:53 -08:00
Tomas Groth
8ba226fe0e Fix layout in player-settings. Fixes bug 1410772 
Fixes: https://launchpad.net/bugs/1410772
 2015-01-19 12:21:00 +01:00
Raoul Snyman
de213b0f66 Copyright cleanup time, 
bzr-revno: 2479
 2015-01-19 08:34:29 +00:00
Ken Roberts
e959511021 Fix invalid call to QMessageBox 2015-01-18 15:42:59 -08:00
Tomas Groth
d424ae51fa Make sure we use dnd position if available. Fixes bug 1410843. 
Fixes: https://launchpad.net/bugs/1410843
 2015-01-18 21:44:34 +00:00
Tomas Groth
ff87971270 Set the default delay-spinbox value from the appropiate setting. Fixes bug 1411765. 
Fixes: https://launchpad.net/bugs/1411765
 2015-01-18 20:52:49 +00:00
Tomas Groth
685b2fde32 Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175 
Fixes: https://launchpad.net/bugs/1405172, https://launchpad.net/bugs/1405175
 2015-01-18 20:38:03 +00:00
Raoul Snyman
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Phill Ridout
b4eb42fed2 remove old thumbnails 2015-01-16 22:13:10 +00:00
Ken Roberts
deb8ae8656 Fix First Time Wizard fail on URL error (ex: proxy authorization) 
Fix spelling

bzr-revno: 2478
Fixes: https://launchpad.net/bugs/1409627
 2015-01-16 22:43:47 +02:00
Tomas Groth
cf30667fb5 Fix Windows tests when running on WINE 
bzr-revno: 2477
 2015-01-16 22:42:00 +02:00
Tomas Groth
36e4b0c8eb Attempt to fix WorshipCenterProImport init under wine tests 2015-01-16 16:25:25 +01:00
Phill Ridout
e5bae7e885 Fixes1410694 by fixing typo, also added additional error. Added the OS Name and version to the version file request headers 
Fixes: https://launchpad.net/bugs/1410694
 2015-01-14 21:35:02 +00:00
Ken Roberts
6be873bd91 spelling 2015-01-14 07:38:50 -08:00
Tomas Groth
1efc145cdf PEP8 fixes 2015-01-14 12:32:27 +01:00
Tomas Groth
cffad28749 Close session after upgrade. Fixes a filelock issue in windows tests. 2015-01-14 11:56:18 +01:00
Phill Ridout
37be7e2ef1 fix images with same name getting same thumbnail 2015-01-13 21:28:55 +00:00
Ken Roberts
9551920821 Catch network error in FTW 2015-01-13 11:03:05 -08:00
Ken Roberts
5bfb5b5426 Add .bin file import support. 
Sometime prior to 2015, SongSelect changed the default file name for USR files to .bin.

bzr-revno: 2474
 2015-01-11 20:27:27 +00:00
Raoul Snyman
3774cf3704 Update the credits in the About dialog 2015-01-11 21:46:41 +02:00
Ken Roberts
4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Raoul Snyman
0bb325fea7 HEAD 2015-01-11 17:17:33 +02:00
0deb0a10cc [bug 1397606] Set the file dialogue box to the currently selected background image 
bzr-revno: 2471
Fixes: https://launchpad.net/bugs/1397606
 2015-01-11 17:17:01 +02:00
Ken Roberts
91933c3e2f [bug 1409031] Fix retry counter when fetching a webpage 
bzr-revno: 2470
Fixes: https://launchpad.net/bugs/1409031
 2015-01-11 17:13:13 +02:00
Ken Roberts
02fb9edeb6 [bug 1407445] Fix remote previous/next calls to servicemananger 
- Remove unneeded Registry() modification
- Fix line spacing

bzr-revno: 2469
Fixes: https://launchpad.net/bugs/1407445
 2015-01-11 17:09:57 +02:00
Raoul Snyman
8758020568 HEAD 2015-01-11 17:02:32 +02:00
Ken Roberts
ac19e018fa Fix retries on connection timeout error 2015-01-09 07:38:10 -08:00
Phill Ridout
e0fa70e47e Set the last file location in the file dialog box 
Fixes: https://launchpad.net/bugs/1397606
 2015-01-08 22:05:32 +00:00
Ken Roberts
3f3c4cf80b remote next/previous call test 2015-01-08 10:07:36 -08:00
Ken Roberts
a4efccb00b Replace remote Registry().execute(event) next/previous with Qt signal 2015-01-06 14:37:18 -08:00
Ken Roberts
093f853fd9 Remove testing api (not needed anymore) 2015-01-05 10:54:44 -08:00
Ken Roberts
2e9f274027 Fix test db temp file for windows, projector edit form notes clearing 2015-01-05 10:36:10 -08:00
Ken Roberts
15f1381de8 Upstream merges 2015-01-04 09:38:59 -08:00
Tomas Groth
9461f334ce Disable webkit and phonon mediaplayers on Mac OS X, 
bzr-revno: 2467
 2015-01-04 09:01:18 +00:00
Phill Ridout
c27c875f33 Readded deleted line. One more comment typo 2015-01-02 11:58:44 +00:00
Phill Ridout
b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Phill Ridout
20d927b270 Rework to use a subclassed QLabel to allow dynamic resizing 2015-01-02 11:40:07 +00:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Ken Roberts
e89558da39 Fix label text for CCLI 
bzr-revno: 2463
 2014-12-31 10:26:50 +00:00
Phill Ridout
52c7d89706 removal of util function 2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized 2014-12-30 11:21:06 +00:00
Phill Ridout
d87c39de44 revert previous changes 2014-12-30 08:55:16 +00:00
Phill Ridout
5d1eac9ded Add function to provide elided text 
Fixes: https://launchpad.net/bugs/1405260
 2014-12-30 08:48:46 +00:00
Phill Ridout
36417083ce head 2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt
46d9d60830 Add missing translationtype to song edit form 
bzr-revno: 2462
 2014-12-28 21:49:54 +00:00
Tomas Groth
25e3e742b9 Fix media end time, Bible Parsing, ServiceManage Preview, locking of keytpress 
bzr-revno: 2461
 2014-12-28 21:46:34 +00:00
Tomas Groth
aae831e90d Disable webkit and phonon mediaplayers on Mac for now 2014-12-26 22:52:14 +00:00
Tomas Groth
98c5dd4865 Fix bug 1405476 by checking if an end_time has been set. 
Fixes: https://launchpad.net/bugs/1405476
 2014-12-26 17:45:34 +00:00
Tomas Groth
853c532bf9 Do not allow edit of start/end time for optical mediaclips in the servicemanager. Fixes bug 1393186 until re-edit of optical clips is added. 
Fixes: https://launchpad.net/bugs/1393186
 2014-12-25 22:02:58 +00:00
Samuel Mehrbrodt
f13a9d00b5 Missing translation type 
Fixes: https://launchpad.net/bugs/1405164
 2014-12-24 11:42:46 +01:00
Tomas Groth
795977b094 Make bible text parsing a bit more rebust, fixes bug 1404865. 
Fixes: https://launchpad.net/bugs/1404865
 2014-12-23 22:09:34 +00:00
Tomas Groth
35de35103b Remove unneeded serviceitem shift when auto previewing. Fixes bug 1405133 and bug 1401234 
Fixes: https://launchpad.net/bugs/1401234, https://launchpad.net/bugs/1405133
 2014-12-23 21:17:20 +00:00
Phill Ridout
c9e1dcceff head 2014-12-23 18:57:04 +00:00
Tim Bentley
98a3cd127f Update code to 2.2 from 2.1 so translators can get working! 
bzr-revno: 2460
 2014-12-22 21:55:44 +00:00
Ken Roberts
3be4f10833 Change edit song ccli label to "CCLI song number" 2014-12-22 12:19:05 -08:00
Tim Bentley
93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Tomas Groth
672e2cc81f trunk 2014-12-19 23:08:23 +00:00
Tomas Groth
321709d7a7 [bug 954613] Introduce locking when updating slide display to avoid slidecontroller and display getting out of sync. 
Fixes: https://launchpad.net/bugs/954613
 2014-12-19 23:07:32 +00:00
Ken Roberts
10b9099f52 Fix typo 2014-12-18 12:51:34 -08:00