Commit Graph

10158 Commits

Author SHA1 Message Date
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