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

10161 Commits

Author SHA1 Message Date
Tim Bentley 39b3b0efbf Release 2.1.5 
bzr-revno: 2543
 2015-05-31 14:53:04 +01:00
Tim Bentley b7d0fc8ffc Fix focus and test 2015-05-31 07:40:37 +01:00
Raoul Snyman bd92e6a7d3 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 
bzr-revno: 2541
 2015-05-30 13:11:32 +01:00
Tomas Groth 623a0974a5 For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
 * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
 * Implement workaround for unblanking bug in PowerPoint 2010.
 * Open PowerPoint hidden so the main application window isn't visible.
 * Added support for odp for PowerPoint 2007 and newer.
 * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
 * Minimized the flashing of the PowerPoint presentation window in the taskbar.

bzr-revno: 2539
 2015-05-29 17:22:22 +01:00
Raoul Snyman 5bcdc85ce1 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 2015-05-28 22:38:43 +02:00
Jonathan Springer aa97feb064 Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen. 
bzr-revno: 2538
 2015-05-28 00:06:22 +02:00
Tomas Groth 9b0ebabc92 Last minute fixes... Don't query window process, instead look at window title for presentation filename. 2015-05-27 10:45:52 +02:00
Tomas Groth 6cd2704814 Revert attempt to try to hide powerpoint presentation window. Instead try to minimized the flashing in the taskbar. 2015-05-26 22:26:59 +01:00
Tomas Groth a5cebb73c4 trunk 2015-05-25 21:58:05 +01:00
Tomas Groth c3e567969b Don't import setting keys that does not exists. Fixes bug 1458672. 
Fixes: https://launchpad.net/bugs/1458672
 2015-05-25 21:43:37 +01:00
Tomas Groth ff5be436ae Make translation of 'Advanced' specific to the bible plugin. 2015-05-25 21:37:29 +01:00
Tim Bentley 1cfd33df30 Fix Jenkins, tests and spellings 2015-05-25 21:03:31 +01:00
Tim Bentley 54dbafed8e Fix issue with android where tagging is wrong is the render takes too long 2015-05-25 20:31:12 +01:00
Tomas Groth aef340b631 Added some logging 2015-05-25 13:08:26 +01:00
Tomas Groth dce6031a9f Only try to hide powerpoint presentation window for powerpoint 2007 and newer. 2015-05-25 12:12:54 +01:00
Tomas Groth 4266d9cbdf For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Fixes: https://launchpad.net/bugs/1458056
 2015-05-25 12:11:04 +01:00
Jonathan Springer 236dba77e8 Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen. 2015-05-21 23:15:15 -04:00
Raoul Snyman b27aae52cf Fix bug#1451237 by overriding the create_item_from_id() method in the child MediaItem class to build a proper QTreeWidgetItem. 2015-05-16 23:24:57 +02:00
Tomas Groth a07b8a8f49 Added support for odp for powerpoint 2007 and newer. 2015-05-08 16:47:02 +02:00
Tomas Groth b52a4e640c Hide the powerpoint presentation window from the taskbar - can be disabled from the settings. 2015-05-08 10:17:35 +02:00
Tomas Groth bf665a8549 Remove unnecessary powerpoint presentation setting. 2015-05-07 14:45:52 +02:00
Tomas Groth 47acc9dc89 pep8 fixes 2015-05-05 11:03:47 +02:00
Tomas Groth cd6903be86 Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus. 2015-05-05 10:53:31 +02:00
Tomas Groth af3eaf2b37 Added an option for letting powerpoint control the size and position for the presentation window. Workaround for windows 8.1 scaling. 2015-05-03 19:25:00 +01:00
Tomas Groth c9a8f07a37 Only use transitions if we are changing slide. Fixes bug 1449064. 
Fixes: https://launchpad.net/bugs/1449064
 2015-05-01 22:17:59 +01:00
Tomas Groth 73ae9a2643 Make screenshots for main webview, even on single screen setup. Fixes bug 1449041. 
Fixes: https://launchpad.net/bugs/1449041
 2015-05-01 16:21:59 +02:00
Tomas Groth cdb564c4f3 Partly revert to old unblanking workaround for powerpoint 2010. 2015-04-30 16:57:26 +02:00
Tomas Groth d044821483 pep8 fixes 2015-04-30 14:48:45 +02:00
Tomas Groth 1333c2ff43 Implement workaround for unblanking bug in powerpoint 2010 2015-04-30 14:38:55 +02:00
Tomas Groth 54fbaf3a4f When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank. 2015-04-30 14:37:13 +02:00
Tomas Groth d4b2148727 trunk 2015-04-28 22:28:52 +01:00
Tomas Groth 472baeb079 Fix blanking 2015-04-28 22:24:01 +01:00
Raoul Snyman fda7ab562c Add some tests 2015-04-28 16:01:09 +02:00
Tomas Groth 9c0525b00c Use return-to-pre-blank-slide fix for all powerpoint versions. 2015-04-28 14:36:43 +02:00
Tomas Groth ed6d454105 Small fixes for powerpoint. 2015-04-28 11:55:40 +02:00
Tomas Groth e21729c14f Fix wrong indentation 2015-04-27 19:07:14 +01:00
Raoul Snyman 07b7d9b6a9 Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out. 
bzr-revno: 2533
 2015-04-27 17:02:16 +01:00
Tomas Groth 23ddd918d1 Open PowerPoint hidden so the main application window isn't visible. 2015-04-27 16:59:22 +01:00
Raoul Snyman 217b731a95 No need to figure out if VLC is available if we've loaded the module before 2015-04-27 11:24:02 +02:00
Raoul Snyman ab54b04468 Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path 2015-04-25 16:32:09 +02:00
Jonathan Springer a162aa50fa merge trunk 2015-04-24 17:00:16 -04:00
Tomas Groth 29f5efeb91 Delete image thumbnails when the image is removed. Fixes bug 1446491. 
Fixes: https://launchpad.net/bugs/1446491
 2015-04-22 20:37:32 +01:00
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 c294ea5752 Make the way we display verse ranges consistent and make use of localized or custom separators. Fixes bug 1081807 
Fixes: https://launchpad.net/bugs/1081807
 2015-04-07 23:01:52 +01:00
Tomas Groth 67ecf9b901 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.
For Impress, go to previous effect instead of the previous slide.

bzr-revno: 2527
Fixes: https://launchpad.net/bugs/1423913, https://launchpad.net/bugs/1194847
 2015-04-03 20:36:02 +02: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 da6f88a7ae Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Fixes: https://launchpad.net/bugs/1439671
 2015-04-02 21:49:19 +01: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
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