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

6322 Commits

Author SHA1 Message Date
Jonathan Springer 86c4acab9c Move adding shortcuts to __default_dict__ into __init__ to avoid having QKeySequences being run before a QApplication is created and crashing 2015-12-23 23:13:50 -05:00
Jonathan Springer b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
Jonathan Springer 9d94845584 Add some missed old shortcuts to their alternate field 2015-12-23 12:58:07 -05:00
Jonathan Springer f3108cffe3 Fix exit dialog 2015-12-22 17:20:39 -05:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
s.mehrbrodt@gmail.com 12141d6a7e Small fixes: 
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
  * OpenLP 2.0 -> OpenLP 2
  * Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
  * Improve exception dialog (mention that description should be english and relevant files should be attached)
  * Do not translate the bug report labels
  * Ignore "E402 module level import not at top of file" pep8 errors (added to ...

bzr-revno: 2574
 2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Jonathan Springer 8327346647 merge trunk 2015-12-16 17:25:41 -05:00
Jonathan Springer 445e755895 Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt. 
Display keyboard shortcuts with modifiers in their platform native form.
 2015-12-16 17:19:50 -05:00
Jonathan Springer 0a935bdb90 merge trunk 2015-12-13 19:21:58 -05:00
Tomas Groth 44a523631e Only import vlc in one place. Make it work with PyInstaller. 2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt 0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer ec4ec887ea Fix CheckMedia player not stopping. 
Fix duration of zero on first play.
 2015-12-10 14:03:57 -05:00
Jonathan Springer fc3c433a21 Fix failing situation by making default_players a list instead of a string 2015-12-10 12:26:08 -05:00
Jonathan Springer 50c0a173eb Add settings migration for phonon to system change 2015-12-07 16:41:15 -05:00
Jonathan Springer baa59f9321 Forgot to uncomment some code 2015-12-07 16:40:45 -05:00
Jonathan Springer 2e23d9919d Fix system player being used for live-background 2015-12-07 16:40:09 -05:00
Jonathan Springer ae4858e434 Fix traceback in mediacontroller if a service item had a processor type of automatic 2015-12-07 16:34:10 -05:00
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 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 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
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@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 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
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
Andreas Preikschat bdd8ef820a Feature: update vlc.py from upstream 2015-10-25 23:00:57 +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 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
Tim Bentley 21743e4472 fix length 2015-09-10 21:35:14 +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 6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -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
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
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 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 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
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 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
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
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
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 d044821483 pep8 fixes 2015-04-30 14:48:45 +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
Raoul Snyman fda7ab562c Add some tests 2015-04-28 16:01:09 +02: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
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 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