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

10158 Commits

Author SHA1 Message Date
Tomas Groth d5804567b5 Added test + some cleaning 2015-04-02 09:33:46 +01:00
Tomas Groth d627982bfe Go to previous effect instead of the previous slide. 2015-04-01 21:38:42 +01:00
Raoul Snyman 02128c85f0 Fix bug #1437771: Clear the song after every import 
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
 2015-03-31 22:58:51 +02:00
Tomas Groth 0e6cff913a Take focus back if Powerpoint steals it - fixes bug 1423913. Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847. Made OpenLP respect hidden slides. Improved logging in case of errors. 
Fixes: https://launchpad.net/bugs/1194847, https://launchpad.net/bugs/1423913
 2015-03-26 15:22:23 +01:00
Tomas Groth e9c0057b96 Fix a traceback by changing filepath to file_path. Fixes bug 1389149. 
Fixes: https://launchpad.net/bugs/1389149
 2015-03-26 15:17:14 +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 d74f2c05ff Fix crash if presentation file in the mediamanger was removed bewteen sessions. Fixes bug 1432418. 
Fixes: https://launchpad.net/bugs/1432418
 2015-03-15 21:53:46 +00:00
Raoul Snyman cecde62157 Fix bug #1411433 by moving some stuff around. 
bzr-revno: 2522
 2015-03-11 18:47:29 +00:00
Tomas Groth 79c1335d41 Only update presentation thumbnails if needed. Fixes bug 1424330. 
Fixes: https://launchpad.net/bugs/1424330
 2015-03-10 22:00:32 +00:00
Raoul Snyman 3c130cf201 Fix bug #1411433 by rearranging methods within the media plugin 
Fixes: https://launchpad.net/bugs/1411433
 2015-03-10 23:33:35 +02:00
Tomas Groth fe6249a9e7 Removed tab from text since transifex cannot handle it. 2015-03-09 22:10:21 +00:00
Tomas Groth c9f2b3d173 typo 2015-03-09 21:39:31 +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
Tomas Groth 512df1451d Use the language id when importing bibles. And fixed presentationcontroller tests. 2015-03-09 20:42:03 +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
Tomas Groth 0777a5cb90 When writing in utf8, also read in utf8 2015-03-06 09:35:47 +01:00
Arjan Schrijver ea96bff031 Add myself as translator 2015-03-01 14:29:47 +01:00
Tim Bentley 5cf4e79489 Fix invalid log_exception 
bzr-revno: 2517
 2015-02-28 18:59:59 +00:00
Oliver Wieland 408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change 
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
 2015-02-28 20:46:31 +02:00
Tim Bentley 1d82bc534c Add tests 2015-02-28 09:41:06 +00:00
Tim Bentley e9be4a9143 head 2015-02-28 07:04:54 +00:00
Tim Bentley 75bae159b0 fix error tag 2015-02-28 07:04:41 +00:00
Raoul Snyman 3131c3f7c8 Some CCLI import fixes, a quitting dialog in one case, and empty lyrics in another. 
Fix bug #1412216 where a song from CCLI without lyrics would cause a traceback - now just tell the user.
Fix bug #1423699 so that you're not logged out when you want to import more songs.

bzr-revno: 2515
 2015-02-28 06:47:35 +00:00
Raoul Snyman e14c03166d Minor style fixes 2015-02-28 01:02:19 +02:00
Raoul Snyman f843e5a8a0 HEAD 2015-02-28 00:30:47 +02:00
Raoul Snyman 7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs. 
Fixes: https://launchpad.net/bugs/1423699
 2015-02-28 00:28:24 +02: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
Tomas Groth 98b2be5bc7 Make presentation controller save notes and titles in utf-8 encoding. Fixes bug 1424972. 
Fixes: https://launchpad.net/bugs/1424972
 2015-02-27 21:11:41 +00:00
Tomas Groth e6f93904f7 trunk 2015-02-26 21:10:35 +00:00
Tomas Groth 7a5787797e Pep8 fixes 2015-02-26 21:02:26 +00:00
Tomas Groth 4fb55448f8 Fixes for code and tests. 2015-02-26 20:58:54 +00:00
Tomas Groth ecc30163af Reverted some things to decrease the changes. It is now working. 2015-02-24 23:04:01 +00:00
Tomas Groth e78a0ba0da Implemented getting languages into combobox. 2015-02-23 22:35:56 +00:00
Oliver Wieland 4e96db4010 fixes bug#1424555 2015-02-23 18:40:56 +01: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
Tomas Groth de58d1c607 Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956. 2015-02-21 13:12:49 +00: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
Raoul Snyman b65e592df9 Bug #1412216: Detect when a song has a problem, show a message to the user, and flip back to the previous screen. 2015-02-21 11:59:37 +02: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 4f94b2acd2 remove fallback 2015-02-18 21:20:35 +00:00
Phill Ridout a6dfbdcf71 fix upgrade_db 2015-02-18 21:13:12 +00:00
Phill Ridout 5e8ad1710b remove old redundant keys 2015-02-18 20:55:30 +00:00
Phill Ridout 14c3d27fed revert db upgrade code 2015-02-18 20:43:51 +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
Tomas Groth 52f3695334 Initial support for fetching list of web bibles. Not used yet. 2015-02-17 22:58:29 +00: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
Ken Roberts 31f28ff03b Fix missed call to md5_hash in presentationcontroller 
bzr-revno: 2499
 2015-02-15 15:15:43 +02: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 3bd5fbd2e8 oops2 2015-02-14 12:35:37 +00:00
Tim Bentley fa61e5b275 oops1 2015-02-14 12:35:20 +00:00
Tim Bentley a3f951e2ce Fix test code 2015-02-14 09:44:04 +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 c3dc1e1a78 If no copyright info is given for bible, don't print it. Fixes bug 1420785. 
Fixes: https://launchpad.net/bugs/1420785
 2015-02-13 20:19:05 +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
Tomas Groth 5795e386d4 Make csv-bible import work with python3. Fixes bug 1421136. 
Fixes: https://launchpad.net/bugs/1421136
 2015-02-12 21:09:25 +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 19e31d7492 Missed encoding for md5_hash 2015-02-10 13:01:22 -08: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
Tomas Groth a5b92f1e87 Fix parsing biblestudytools.com. Fixes bug 1418212. 
Fixes: https://launchpad.net/bugs/1418212
 2015-02-06 20:29:38 +00:00
Ken Roberts 0636985a74 fix presentation controller call to md5_hash 2015-02-04 09:20:14 -08: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
Tomas Groth 5b717db63a Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033. 
Fixes: https://launchpad.net/bugs/1417033
 2015-02-02 20:40:31 +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
Phill Ridout 0dee929f30 Test fix 2015-02-01 21:40:17 +00:00
Philip Ridout cfa8e4f2df Fixes #1414585 Thumbnail of images isn't shown in stage view and remote control 
and #1414585 2.1.2 Traceback on Presentations for MAC

bzr-revno: 2494
 2015-02-01 19:51:54 +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
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
Ken Roberts c596940a15 Fix notes edit not clearing between calls, added projectoreditform tests 2014-12-18 10:50:51 -08:00
Tim Bentley 5686e85384 Fix custom duplication bug 2014-12-16 07:47:46 +00:00
Raoul Snyman fe02a80e26 HEAD 2014-12-14 22:37:36 +02:00
Raoul Snyman ba81146093 Fix a bug inadvertently introduced in the merge conflict. 2014-12-14 22:37:24 +02:00
Ken Roberts b2f6eaf7d4 [Fix #1386913] "Discard" option in projector-select input option should only be for editing source input text 
- Fix "Discard" and "Reset" dialog buttons calling wrong functions (swapttped)
- Fix dialog title text to reflect proper "Select" or "Edit" title
- Fix tabbed dialog width to be consistent
- Added calls to translate for user text
- Added basic test for openlp.core.ui.projector.sourceselectform

bzr-revno: 2457
Fixes: https://launchpad.net/bugs/1386913
 2014-12-14 22:34:52 +02:00
Phill Ridout e93eda152b fixes bug1390236 by limiting the selection in the media manager when a large number of results are returned 2014-12-14 16:56:48 +00:00
Phill Ridout ae852466ec Fix selecting items in media manager using the keyboard when preview media items when clicked is set 2014-12-14 16:54:25 +00:00
Raoul Snyman 5742f7546e Fixed up merge conflicts. 2014-12-12 22:57:42 +02:00
Phill Ridout 2642a21d53 Refactor get_uno_command & get_uno_instance 2014-12-08 07:19:51 +00:00
Phill Ridout 2dd7a6e776 remove print statment 2014-12-07 17:53:32 +00:00
Phill Ridout 2aff850b64 HEAD 2014-12-07 17:46:46 +00:00
Phill Ridout 9d54d6351a Tests 2014-12-07 17:46:23 +00:00
Tomas Groth 4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar. 
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
 2014-12-07 08:21:37 +00:00
24a8f67fd0 Handle LibreOffice and SOffice commands on linux 
Fixed imports conflict on merge.

bzr-revno: 2453
 2014-12-07 08:20:30 +00:00
Philip Ridout c9a2b87ac5 Fix links and Color buttons 
bzr-revno: 2452
 2014-12-07 08:16:15 +00:00
Tomas Groth df6c533387 Fix upgrade on song db with lost version. Fixes bug 1391638. 
Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015.
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271.

bzr-revno: 2451
 2014-12-07 08:13:52 +00:00
Tomas Groth 46641fecbe Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944). 
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.

bzr-revno: 2450
 2014-12-07 08:11:59 +00:00
Tomas Groth 56f4b8aa5e Another fix for blank menu. 2014-12-06 20:40:40 +00:00
Tomas Groth 4123b9af1d Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type. 2014-12-06 20:08:42 +00:00
Tomas Groth 402e91f688 When cloning a song copy the mediafiles as well. Fixes bug 1309998 
Fixes: https://launchpad.net/bugs/1309998
 2014-12-05 22:36:49 +00:00
Tomas Groth be12ce54bb Use shutil.which instead of calling which with check_output. 2014-12-05 21:10:58 +00:00
Phill Ridout e190bf30e9 Fixes 1397570 by 'feature detection' 2014-12-05 17:04:44 +00:00
Tomas Groth fd57f81376 Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden 2014-12-04 22:14:56 +00:00
Tomas Groth 782b3d3bcf trunk 2014-12-03 22:35:06 +00:00
Tomas Groth fd48879513 The fix for loading songs with linked audio. Fixes bug 1398403 
Fixes: https://launchpad.net/bugs/1398403
 2014-12-03 22:31:23 +00:00
Tomas Groth e94579e7f1 Only update blank menu if needed 2014-12-03 21:19:43 +00:00
Phill Ridout 70c3a21620 HEAD 2014-12-03 19:50:41 +00:00
Phill Ridout fc4eb5dd4d URL updates. PEP fix 2014-12-03 17:45:34 +00:00
Tomas Groth 767e3d91f2 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar. 2014-12-02 11:07:03 +00:00
Tomas Groth 20394de842 pep8 fix 2014-12-02 10:02:13 +00:00
Tomas Groth af4715dc3c Remove the registered functions instead of overwriting 2014-12-02 09:46:19 +00:00
Tomas Groth 1c71efc532 Allow overwriting functions in registry, and use it when registring MainDisplay. Fixes bug 1397287 
Fixes: https://launchpad.net/bugs/1397287
 2014-12-01 15:08:13 +00:00
Phill Ridout 563347c8b8 HEAD 2014-11-30 07:44:57 +00:00