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

10314 Commits

Author SHA1 Message Date
Jonathan Springer
3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Jonathan Springer
05a653e670 Make sure all generated pixmaps are show at the proper pixel ratio 2015-11-29 17:48:10 -05:00
Tim Bentley
3a31f86e84 Head 2015-11-28 17:05:06 +00:00
Tim Bentley
64867b52a8 Add tests for Presentations 2015-11-28 17:04:46 +00:00
Tim Bentley
1ba8652985 Remove Prints 2015-11-28 15:38:31 +00:00
Tim Bentley
ae1888106d Fix Presentations and Media 2015-11-28 15:37:26 +00:00
Jonathan Springer
c37b033ba0 Fix typo in typo fix 2015-11-23 14:14:58 -05:00
Jonathan Springer
9e349b55f7 Fix typo 2015-11-23 14:04:10 -05:00
Jonathan Springer
7d3ec1ae24 Fix typo 2015-11-23 13:55:56 -05:00
Tim Bentley
fba6767e79 fix old versions 2015-11-22 14:06:54 +00:00
Tim Bentley
78078fb2ed catchup late fixes from 2.2.1 2015-11-21 08:31:17 +00:00
Jonathan Springer
9c46eda524 Enable and fix mimetype filters. 
Make sure file can be played due to lack of mimetype support on Linux and Windows
 2015-11-16 22:59:30 -05:00
Tim Bentley
a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley
ae21d548ba fix join 2015-11-08 21:19:54 +00:00
Tim Bentley
97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Tim Bentley
1ff9413d5a remove s 2015-11-08 20:23:16 +00:00
Tim Bentley
7299aae51c fix code 2015-11-08 20:19:02 +00:00
Jonathan Springer
285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley
19a2deef30 allow local remote views 2015-11-06 21:43:31 +00:00
tim.bentley@gmail.com
7c5add7fac First merge for 2.4. 
A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

bzr-revno: 2566
Fixes: https://launchpad.net/bugs/913508, https://launchpad.net/bugs/1168778, https://launchpad.net/bugs/1281100, https://launchpad.net/bugs/1390699, https://launchpad.net/bugs/1390706, https://launchpad.net/bugs/1413217, https://launchpad.net/bugs/1420276, https://launchpad.net/bugs/1439304, https://launchpad.net/bugs/1487014
 2015-11-05 19:05:19 +00:00
tim.bentley@gmail.com
7fb1b03e75 Fix the pep 8 text. 
lp:~trb143/openlp/bug-about (revision 2566)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1170/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1093/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1034/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/881/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/477/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/597/
[SUCCESS] https//ci.openlp.io/j...

bzr-revno: 2565
 2015-11-04 18:39:01 +00:00
Tim Bentley
a888a4a4aa more missed 2015-11-04 18:37:06 +00:00
Tim Bentley
ba823a9302 fix align 2015-11-02 21:30:11 +00:00
Tim Bentley
6e754ec0a6 fix align 2015-11-02 21:25:38 +00:00
Tim Bentley
20f0d39113 fix align 2015-11-02 21:19:01 +00:00
Tim Bentley
0e4847b5fa head 2015-11-02 20:57:48 +00:00
second@tgc.dk
2cca48f26b Made ZionWorx importer work under python3, fixes bug 1510282. 
Improved WorshipCenter Pro import, support more fields and verse types.

bzr-revno: 2564
Fixes: https://launchpad.net/bugs/1225760, https://launchpad.net/bugs/1510282
 2015-11-02 20:56:27 +00:00
Tim Bentley
d165010aaa minor fix ups 2015-11-02 20:52:22 +00:00
Tim Bentley
89d9d7d73a replace code removed in error 2015-10-28 21:21:05 +00:00
Tomas Groth
05043edb6d Strip trailing whitespaces from verse-string. 2015-10-28 16:43:17 +00:00
Tomas Groth
fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tomas Groth
85f034abdd Make zionwork imported work with python3 
Fixes: https://launchpad.net/bugs/1510282
 2015-10-27 12:28:13 +00:00
Andreas Preikschat
bdd8ef820a Feature: update vlc.py from upstream 2015-10-25 23:00:57 +01:00
Tim Bentley
a197e92f7d Missing strings 2015-10-22 17:23:40 +01:00
Tim Bentley
ae8b2d051a Fix about dialog from translators 2015-10-19 22:14:30 +01:00
Tim Bentley
25332a2cb1 Head and 2.2 2015-10-17 12:20:51 +01:00
Tim Bentley
50ceb568e5 Release 2.2 
bzr-revno: 2562
 2015-10-17 12:18:23 +01:00
Tim Bentley
375884b1bb Songs 2015-10-16 17:58:22 +01:00
Tim Bentley
9590de703a plugins again 2015-10-16 17:49:58 +01:00
Tim Bentley
e8f0844339 custom 2015-10-16 17:43:48 +01:00
Tim Bentley
ae1124f8bd bible 2015-10-16 17:38:39 +01:00
Tim Bentley
6b60573740 UI changes 2015-10-16 17:30:13 +01:00
Tim Bentley
742e0c912b Plug item 2015-10-16 17:26:01 +01:00
Tim Bentley
a5b8827c96 Pep 8 2015-10-16 17:17:38 +01:00
Tim Bentley
58124c01d2 Add advanced 2015-10-16 17:09:35 +01:00
second@tgc.dk
48c9389a9f Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. 
bzr-revno: 2560
 2015-10-15 21:52:13 +01:00
Tim Bentley
925623bf74 core_int 2015-10-15 19:03:57 +01:00
Tim Bentley
ccd604b3be Strings 2015-10-15 19:00:39 +01:00
Tim Bentley
cd4034ebf1 settings 2015-10-15 18:56:17 +01:00
Raoul Snyman
191a739f81 Let's download things once only, instead of 3 times. 2015-10-14 23:19:02 +02:00
Tomas Groth
949bf4a8a7 Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. 2015-10-13 22:52:33 +01:00
Tomas Groth
62e9663aec Make 2 texts translateable 2015-10-12 13:59:17 +01:00
Tomas Groth
19bd2dd25a pep8 fixes 2015-10-10 21:50:59 +01:00
Tomas Groth
cacb3ca0a0 Fix string that makes it possible to translate the string. 2015-10-03 13:00:44 +01:00
Tomas Groth
05899eb41d Update link to google play store 2015-10-01 12:17:26 +01:00
Tim Bentley
21743e4472 fix length 2015-09-10 21:35:14 +01:00
Tim Bentley
afa4f7b0b2 fix broken trunk 2015-09-10 21:27:17 +01:00
Jonathan Springer
d60a1e8340 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 
Change relative import in bible db to absolute import
Docstring cleanups

bzr-revno: 2554
 2015-09-10 22:11:46 +02:00
Jonathan Springer
85d2cfda6a Move icon creation inside setup_item to avoid generating the icon multiple times 2015-09-09 16:02:19 -04:00
Jonathan Springer
6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Jonathan Springer
46d4105cb1 Change relative import to absolute import 2015-09-08 15:13:26 -04:00
Jonathan Springer
934a9cb7b3 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 2015-09-08 15:11:09 -04:00
Tomas Groth
1dcbc6837c Make the fix for bug 1473632 work on more linux distros. 2015-09-04 10:01:07 +01:00
Tomas Groth
fec061782b Make sure presentations is closed correctly. Fixes bug 1490996. 
Fixes: https://launchpad.net/bugs/1490996
 2015-09-03 20:21:43 +01:00
Tomas Groth
964af5fc92 Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998. 
Fixes: https://launchpad.net/bugs/1491998
 2015-09-03 20:11:08 +01:00
Tomas Groth
0b4cf91c42 Fix traceback on windows in the OO/LO song importer. 
Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fix SongPro import. Fixes bug 1489376.
Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.

bzr-revno: 2552
 2015-08-28 22:05:57 +01:00
Jonathan Springer
54a18c68a2 Add ability to open Apple help file from app bundle. Only show offline help if we are running frozen. 
bzr-revno: 2551
 2015-08-28 21:28:35 +02:00
Tomas Groth
579f532aec Removed unnecessary line. 2015-08-28 14:20:17 +01:00
Tomas Groth
c559741143 Forgot to remove debug print... 2015-08-28 13:34:28 +01:00
Tomas Groth
0c24d3705b Fix traceback on windows in the OO/LO song importer. 2015-08-28 11:22:06 +01:00
Tomas Groth
585c319c8b Improved the robustness of the download-webbibles-form. Fixes bug 1489757. 
Fixes: https://launchpad.net/bugs/1489757
 2015-08-28 09:50:13 +01:00
Tomas Groth
4488fedfdc Fix SongPro import. Fixes bug 1489376. 
Fixes: https://launchpad.net/bugs/1489376
 2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt
7477f781ef Close -> Exit (as in the menu) 2015-08-27 10:15:51 +02:00
Tomas Groth
f98c35df94 Fix traceback on linux when VLC isn't installed. Fixes bug 1489143. 
Fixes: https://launchpad.net/bugs/1489143
 2015-08-26 22:37:23 +01:00
Samuel Mehrbrodt
813cbaf2ad PEP8 2015-08-26 10:40:09 +02:00
Samuel Mehrbrodt
8d791a51f4 Better wording for close dialog 2015-08-26 10:37:16 +02:00
Samuel Mehrbrodt
2df4dad39c Improve exception dialog 2015-08-26 10:20:55 +02:00
Samuel Mehrbrodt
0c9f23a875 PEP8 2015-08-26 09:59:27 +02:00
Samuel Mehrbrodt
eac92737a2 Better strings for translation 2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt
fce9a1e1f2 OpenLP 2.0 -> OpenLP 2 2015-08-26 09:26:19 +02:00
Jonathan Springer
59a04e982f Add ability to open Apple help file from app bundle. 
Only show offline help if we are running frozen.
 2015-08-24 14:19:30 -04:00
Raoul Snyman
f36a9c29dc Release 2.1.6 
bzr-revno: 2550
 2015-08-23 21:04:23 +02:00
Tomas Groth
8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth
5940a77b20 Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632. 
Fixes: https://launchpad.net/bugs/1473632
 2015-07-20 21:33:58 +01:00
Tomas Groth
25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +01:00
Tomas Groth
4e3b1c0e8f Revert changes to support python 3.5 to make sure we support python 3.3. 2015-07-04 22:09:59 +01:00
Tomas Groth
03b5ec6d16 Catch songselect connections error. Fixes bug 1464421. 
Fixes: https://launchpad.net/bugs/1464421
 2015-06-17 18:46:45 +01:00
Tomas Groth
3b0b75e5b6 Remove unneeded import. 2015-06-16 09:47:42 +02:00
Tomas Groth
aea6c424fc Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390. 
Fixes: https://launchpad.net/bugs/1465390
 2015-06-15 21:29:34 +01:00
Tomas Groth
bdecfbf3e9 Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703. 
Fixes: https://launchpad.net/bugs/1463703
 2015-06-10 17:14:23 +02:00
Tomas Groth
1b332c1580 Fix PDF reader using wrong maindisplay size. 2015-06-10 17:05:29 +02:00
Tomas Groth
60d45d8b8b Fix log-traceback when trying to remove servicemanager files before eg. powerpoint has closed the files. 2015-06-08 20:34:22 +01:00
Tomas Groth
e3be044d5d Improve network exception handling, again. 2015-06-08 20:32:46 +01:00
Tomas Groth
7eb506fae8 Improve network exception handling. 2015-06-07 21:56:06 +01:00
Tomas Groth
14031720be Fix timer that checks for presentation slide change, remove powerpoint event handler that did the same. 2015-06-05 22:22:16 +01:00
Tomas Groth
0e2e281fa0 pep8 fix 2015-06-04 00:27:56 +01:00
Tomas Groth
bee9808503 Hide the main impress window when loading a presentation, but make it visible for a moment when starting presentation. Hopefully fixes bug 1420356. 
Fixes: https://launchpad.net/bugs/1420356
 2015-06-04 00:27:03 +01:00
Tomas Groth
f0232d7147 Improve the detection of powerpoints presentation window by only looking at the filename root. 2015-06-02 22:53:11 +01:00
Tomas Groth
2bc78ffd25 Fix traceback when going live with presentation while blanked to desktop 2015-06-02 22:16:10 +01:00
Tomas Groth
3f145078f5 Set service_item.name to "images" for pdfs (which are images though they are presentations) 2015-06-02 22:13:15 +01:00
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