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

6234 Commits

Author SHA1 Message Date
Tomas Groth f8114d0b97 Disable button for replacing live background if the webkit player is not available. 2015-04-21 22:49:22 +01:00
Tomas Groth cd7c4f6197 Make sure we always add a blank line between verses. Fixes bug 1439311. 
Fixes: https://launchpad.net/bugs/1439311
 2015-04-11 23:13:30 +01:00
Tomas Groth 6f5a139329 Normalize file path to OS standard after drag-and-drop. Fixes bug 1440571. 
Fixes: https://launchpad.net/bugs/1440571
 2015-04-07 23:20:30 +01:00
Tomas Groth cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
 2015-04-03 20:31:19 +02:00
Tomas Groth 589bc98bec Use html.escape instead of the deprecated cgi.escape 2015-04-02 21:32:20 +01:00
Tomas Groth f8b575065a pep8 fix 2015-04-02 21:29:43 +01:00
Tomas Groth d2301e016e improved logging 2015-04-02 13:50:50 +01:00
Tomas Groth 335c804e8f Fix support for special characters in theme names. Fixes bug 1438563. 
Fixes: https://launchpad.net/bugs/1438563
 2015-04-02 10:04:56 +01:00
Jonathan Springer 16425b05a0 Fix bug 1247661 by restoring to main window when the dock icon is clicked 2015-03-24 18:33:57 -04:00
Tomas Groth 25f6fe0a59 Fix another case of bug 1422761. 
Fixes: https://launchpad.net/bugs/1422761
 2015-03-20 17:03:45 +00:00
Tomas Groth f8084059ba Added test + small fixes. 2015-03-18 22:04:30 +00:00
Tomas Groth 7e406e7005 Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324. 
Fixes: https://launchpad.net/bugs/1413324
 2015-03-18 22:02:51 +00:00
Tomas Groth b3fd23da59 Updated the list of extensions supported by VLC. 2015-03-18 20:44:35 +00:00
Tomas Groth 27332f87e1 Run XInitThreads when using VLC to make it work correctly. Fixes bug 1433245. 
Fixes: https://launchpad.net/bugs/1433245
 2015-03-17 22:06:21 +00:00
Tomas Groth c3d21ca742 Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478. 2015-03-16 21:32:56 +00:00
Tomas Groth e34179795b Attempt to fix a webkit player exception 2015-03-15 22:34:12 +00:00
Tomas Groth fe6249a9e7 Removed tab from text since transifex cannot handle it. 2015-03-09 22:10:21 +00:00
Tomas Groth 39c79aaed9 PEP8 fixes 2015-03-09 20:57:39 +00:00
Tomas Groth aefe3e9cad trunk 2015-03-09 20:42:28 +00:00
Raoul Snyman 54c23cc7bd Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click 
Fixes: https://launchpad.net/bugs/1419300
 2015-03-07 00:18:51 +02:00
Arjan Schrijver ea96bff031 Add myself as translator 2015-03-01 14:29:47 +01:00
Tim Bentley 1d82bc534c Add tests 2015-02-28 09:41:06 +00:00
Tim Bentley 75bae159b0 fix error tag 2015-02-28 07:04:41 +00:00
Tomas Groth 84a0fa0ecd Moved string format input outside calls to translate. Fixes bug 1425035. 
Fixes: https://launchpad.net/bugs/1425035
 2015-02-27 21:14:08 +00:00
Raoul Snyman 4847efdfd6 Release 2.1.3 
bzr-revno: 2513
 2015-02-21 22:05:25 +02:00
Ken Roberts 85b8cb2c50 Fix bug 1422683: Added exception checks to get_web_page() to help with changed description. Rearrange calls so thumbnail downloads don't hang other event threads. Reraise exception when retries > CONNECTION_RETRIES. 
bzr-revno: 2512
Fixes: https://launchpad.net/bugs/1422683
 2015-02-21 21:11:25 +02:00
Ken Roberts 23ef01bce2 Fix typo's in function calls 
bzr-revno: 2511
 2015-02-21 21:08:55 +02:00
Tomas Groth 66b898f2c3 Don't try to play media if no players are available. Fixes bug 1422761. 
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.

bzr-revno: 2510
Fixes: https://launchpad.net/bugs/1422761, https://launchpad.net/bugs/1423956
 2015-02-21 21:03:59 +02:00
Phill Ridout a6fed0a3e5 HEAD 2015-02-21 13:10:28 +00:00
Phill Ridout 4b52fde1da Fixes possible bug and adds test 2015-02-21 13:08:56 +00:00
Tomas Groth df9594e11d trunk 2015-02-21 12:45:44 +00:00
Phill Ridout 05ce21104d PEP fix 2015-02-19 21:57:26 +00:00
Phill Ridout a255faa95b HEAD 2015-02-19 21:53:21 +00:00
Phill Ridout fa5b036323 adds bytes type 2015-02-19 21:47:53 +00:00
Phill Ridout fb20f9243f Further fixes 2015-02-19 21:24:12 +00:00
Ken Roberts b62bb37776 Reraise exception if retries > CONNECTION_RETRIES 2015-02-19 09:17:04 -08:00
Ken Roberts fd81d2d80a Fix thumbnail download blocking events 2015-02-19 07:34:09 -08:00
Ken Roberts 64d0a42946 Typos in projector.manager 2015-02-18 14:21:39 -08:00
Tomas Groth 83ad7c31d7 Don't try to play media if no players are available. Fixes bug 1422761 
Fixes: https://launchpad.net/bugs/1422761
 2015-02-18 21:32:42 +00:00
Phill Ridout a6dfbdcf71 fix upgrade_db 2015-02-18 21:13:12 +00:00
Ken Roberts 33d8dcfa50 Reraise exception outside of checks 2015-02-18 12:40:39 -08:00
Ken Roberts 2b63b5d3ad Add extra exceptions to get_web_page 2015-02-18 08:13:36 -08:00
Ken Roberts 80055b7ec0 Fix ftw socket.timeout bug 1422683 2015-02-17 13:27:51 -08:00
Tomas Groth 7c0386b7c0 Fixes for mysql as db backend 
bzr-revno: 2504
 2015-02-17 19:50:18 +00:00
Tim Bentley 870b69b497 Remove cache for http authentication 
bzr-revno: 2503
 2015-02-17 19:49:16 +00:00
Tomas Groth 1b2b1c74cc Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197. 
If no copyright info is given for bible, don't print it. Fixes bug 1420785.
Make csv-bible import work with python3. Fixes bug 1421136.
Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.

bzr-revno: 2502
 2015-02-17 18:50:10 +00:00
Philip Ridout f7cb420a31 Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog. 
Also added a ValidationError exception class, to tidy up the unzip code slightly

bzr-revno: 2501
 2015-02-17 05:51:24 +00:00
Philip Ridout 16758d1b80 Fixes bug1073931 "Corrupted databases stop OpenLP from starting" 
Checks if the database session is available before trying to use it.
Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256

bzr-revno: 2500
 2015-02-17 05:47:19 +00:00
Tomas Groth f01aa970a7 Revert fix for bug 1421561, it is fixed elsewhere. 2015-02-16 22:03:59 +00:00
Tomas Groth 06355032a2 Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197. 
Fixes: https://launchpad.net/bugs/1422197
 2015-02-16 21:59:55 +00:00
Tomas Groth 0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tomas Groth aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888. 
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
 2015-02-14 15:11:11 +00:00
Tim Bentley 58f10d3b6b Fix cache for http authentication 2015-02-14 09:12:35 +00:00
Phill Ridout 6ca70bbc5c New line at end of file 2015-02-13 23:27:25 +00:00
Phill Ridout 2eb58a56bd PEP fixes 2015-02-13 23:21:57 +00:00
Phill Ridout 498d17b000 Added tests 2015-02-13 23:10:16 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Phill Ridout af2467ed93 Check for theme version. Implement a custom exception 
Fixes: https://launchpad.net/bugs/1419691
 2015-02-13 21:47:06 +00:00
Phill Ridout 77109e61fd Update doc string 2015-02-13 21:00:55 +00:00
Phill Ridout 3e697dc213 HEAD 2015-02-13 20:41:54 +00:00
Phill Ridout 126873ddaa fixes bug1416703 by implementing a function to do the conversion 
Fixes: https://launchpad.net/bugs/1416703
 2015-02-13 20:41:34 +00:00
Tomas Groth 340a766bba Change ConnectionException to ConnectionError. Fixes bug 1421561 
Fixes: https://launchpad.net/bugs/1421561
 2015-02-13 20:10:53 +00:00
Phill Ridout e35a1d7763 head 2015-02-12 21:35:26 +00:00
Phill Ridout b427e216f1 small fixes 2015-02-12 21:24:39 +00:00
Phill Ridout f6de8a4f7a Fix 1416703 2015-02-12 20:44:34 +00:00
Tomas Groth 733812572c Added projector and fixed spelling. 2015-02-11 22:15:46 +00:00
Tomas Groth 8c8fbe45b2 Fixes to make mysql db work 2015-02-11 20:56:13 +00:00
Tomas Groth bab5e90e20 Adjust error messages. 2015-02-10 22:25:30 +00:00
Ken Roberts 88cb02bb3d Fix bug #1417809: Remove default ascii encoding so md5hash can be used to hash other data. 
bzr-revno: 2497
Fixes: https://launchpad.net/bugs/1417809
 2015-02-10 21:38:53 +02:00
Tomas Groth 1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered. 
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
 2015-02-10 21:24:33 +02:00
Tomas Groth 12a0b8b750 Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570. 
Fixes: https://launchpad.net/bugs/1412570
 2015-02-09 20:49:24 +00:00
Phill Ridout 08e1404ffb rename some of the unpacked vars 2015-02-08 18:38:47 +00:00
Tomas Groth d8e6f35694 Handle OSError exception when creating files in various places. Fixes bug 1416888. 
Fixes: https://launchpad.net/bugs/1416888
 2015-02-06 22:17:24 +00:00
Ken Roberts a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
Tomas Groth 7287759ba5 Fixed a string 2015-02-03 23:41:30 +00:00
Ken Roberts a50744adbc Added sha1_filecheck 2015-02-03 14:54:41 -08:00
Phill Ridout b6493bebbf Final Fixes 2015-02-02 22:04:30 +00:00
Phill Ridout b8838f496a Modified download hashing 2015-02-02 19:25:34 +00:00
Ken Roberts b02d44416a Allow md5check to use non-ascii encoding, added md5_filecheck 2015-02-02 10:00:39 -08:00
Phill Ridout 4c36bba911 head 2015-02-01 21:40:59 +00:00
Philip Ridout b40f931618 Fix - Preview media slider repeatedly shows "Error Occurred" dialogue box 
bzr-revno: 2493
 2015-02-01 15:04:37 +00:00
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
Tim Bentley 6f76c164e0 fix delete 2015-01-30 21:15:03 +00:00
Phill Ridout 59088887fc PEP Fixes 2015-01-29 21:21:03 +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
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
Phill Ridout bfe1824cb4 removed redundant code 2015-01-26 21:18:23 +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
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 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 7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +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 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
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
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02: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
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
Ken Roberts 9551920821 Catch network error in FTW 2015-01-13 11:03:05 -08:00
Raoul Snyman 3774cf3704 Update the credits in the About dialog 2015-01-11 21:46:41 +02: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 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 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
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
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
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