Commit Graph

12179 Commits

Author SHA1 Message Date
Ken Roberts a503c61a51 PJLink2 update v05 2019-05-04 03:21:48 -07:00
Phill 15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
Ken Roberts 2a479a15da pjlink2 update v04 2019-05-03 22:25:07 -07:00
Tim Bentley feaee351b2 head 2019-05-03 18:26:37 +01:00
Tim Bentley 50e2c6e5e9 updates 2019-05-03 18:25:27 +01:00
Raoul Snyman d95b4343b5 Temporary workaround for VLC 2019-05-02 20:23:23 -07:00
Raoul Snyman d42a7118c0 HEAD 2019-05-02 20:20:05 -07:00
Bastian Germann db9cc8c310 Add PyMuPDF as additional PDF controller and missing mupdf file formats
bzr-revno: 2864
2019-05-02 14:47:05 -07:00
Raoul Snyman 46bb693d18 Fix command line args 2019-05-02 11:59:09 -07:00
Bastian Germann 3e23de5bbe Make pylint happy 2019-05-02 19:11:55 +02:00
Bastian Germann 605eadb0c2 Add epub, cbz, and fb2 support to pdf controller 2019-05-02 15:45:07 +02:00
Bastian Germann 2ee21a77c4 Use PyMuPDF over executables if not explicitly set 2019-05-02 11:19:23 +02:00
Tomas Groth 5f63b1297f trunk 2019-05-01 21:22:01 +02:00
Tomas Groth 85879122ab Implement suggestions and fix test. 2019-05-01 21:19:21 +02:00
Bastian Germann a3ef19dbd9 Make pylint happy 2019-05-01 11:00:53 +02:00
Bastian Germann a610133919 Introduce PyMuPDF as additional PDF controller 2019-05-01 10:39:01 +02:00
Tomas Groth b3c1996e4f Handle absolute and relative paths. 2019-04-30 21:43:41 +02:00
Tomas Groth e14dd69817 trunk 2019-04-30 21:02:42 +02:00
Bastian Germann b4e24f10d6 Update new file to GPLv3+ 2019-04-28 21:22:52 +02:00
Bastian Germann d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
Ken Roberts d6cf6cf6bf PJLink2 update V03 2019-04-28 00:03:51 -07:00
Tim Bentley 56722b2729 updates 2019-04-27 16:12:24 +01:00
Tim Bentley 656c1d3bfc fix pep8 2019-04-21 13:48:23 +01:00
Tim Bentley 607d678780 seek slider works 2019-04-21 09:20:43 +01:00
Tim Bentley f5a2a58234 head 2019-04-21 07:27:05 +01:00
Tim Bentley 0088fd4fe2 fix image theme editing 2019-04-21 07:25:46 +01:00
Ken Roberts 5f6887f837 PJLink2 Update V1 2019-04-20 18:04:59 -07:00
Tim Bentley 468df46c9c More fixes and corrections 2019-04-20 21:29:12 +01:00
Bastian Germann be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Tomas Groth f669b8cd7e Followup fix... 2019-04-13 10:24:15 +02:00
Raoul Snyman 84fc07d15d HEAD 2019-04-12 22:10:23 -07:00
Tim Bentley f1bf3c3000 Finish experimental and start media tab 2019-04-12 22:03:23 +01:00
Tomas Groth 41d876be52 Fix errors detected by pylint. 2019-04-12 21:16:00 +02:00
Raoul Snyman 5786a3f5ac Use the full path to the dll/dylib 2019-04-11 22:52:06 -07:00
Raoul Snyman 453191f395 Move the VLC setup to after the logging is set up 2019-04-11 20:57:15 -07:00
Raoul Snyman 8f4e7dc7db debugging 2019-04-11 20:55:45 -07:00
Raoul Snyman a16853e2d7 Debugging when not frozen too 2019-04-11 20:51:44 -07:00
Raoul Snyman cec6f13506 Log VLC path for debugging 2019-04-11 20:24:47 -07:00
Raoul Snyman f1f313ed5f Detect if OpenLP is running as a frozen app, and set the VLC environment variable 2019-04-11 14:55:57 -07:00
Tim Bentley 49384aa672 head 2019-04-09 19:35:10 +01:00
Tim Bentley 3fd074f5c2 pep8 2019-04-09 18:32:10 +01:00
Tim Bentley 0e57b10263 add experimental flag 2019-04-09 18:21:35 +01:00
Tim Bentley 737d320b3d handle missing live display preserve prview 2019-04-09 17:47:23 +01:00
Tomas Groth ac0c27a7f4 Update Reveal.js to 3.8.0.
bzr-revno: 2855
2019-04-08 23:09:34 -07:00
Samuel Mehrbrodt c038476b80 Fix songstab 2019-04-08 23:06:05 +02:00
Samuel Mehrbrodt 68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Tomas Groth 2d83738405 Upgrade to Reveal.js 3.8.0 2019-04-08 21:47:05 +02:00
Tim Bentley 6bea242ae4 Fixes and handle missing display 2019-04-08 18:19:18 +01:00
Tomas Groth 52bdb8db02 Added support for disabling Impress Presentation Screen. Fixes bug 1798651
Fixes: https://launchpad.net/bugs/1798651
2019-04-02 22:22:05 +02:00
Phill 98f7c28d65 Add proxy settings to ftw. Option to skip sample data
bzr-revno: 2853
2019-03-28 22:03:32 +01:00
Samuel Mehrbrodt 720d79e46a Fix songbook as first slide display
bzr-revno: 2851
2019-03-28 21:19:15 +01:00
Tomas Groth 2ebccbfb91 trunk 2019-03-27 21:33:21 +01:00
Tomas Groth 4e739a3ed9 Disable the presentation console 2019-03-27 21:29:19 +01:00
Tim Bentley 0a2de8e606 fix pep8.5 2019-03-27 19:21:11 +00:00
Tim Bentley ae2109e509 fix pep8.5 2019-03-27 18:59:03 +00:00
Tim Bentley b7bb59a837 vlc tests pass 2019-03-27 17:46:12 +00:00
Tim Bentley 6cb16a9f0a media now works and plays 2019-03-25 21:45:19 +00:00
Tim Bentley f849b0eeb0 head 2019-03-25 21:24:51 +00:00
Tim Bentley 112fac8baf Media is now playing again - just 2019-03-24 07:53:19 +00:00
Philip Ridout 8789073eb3 Linting changes 2019-03-17 20:35:11 +00:00
Philip Ridout 573f31fd45 Minor tidy ups 2019-03-17 10:36:12 +00:00
Philip Ridout eb115a0ad4 More pathlib clean ups 2019-03-17 10:01:52 +00:00
Philip Ridout 7c284ad520 Fix deleting bibles
Fixes: https://launchpad.net/bugs/1748719
2019-03-16 21:07:44 +00:00
Philip Ridout cae0c2eb09 Revert commented code 2019-03-16 10:58:59 +00:00
Philip Ridout d8644648a4 Fit the logo to the Main Display
Fixes: https://launchpad.net/bugs/1819763
2019-03-16 10:26:05 +00:00
Philip Ridout 296adb59a0 Bible import issues 2019-03-16 10:20:46 +00:00
Philip Ridout e1d2c67f33 HEAD? 2019-03-15 20:56:32 +00:00
Philip Ridout 056b902cf9 PEP8 2019-03-15 20:47:47 +00:00
Philip Ridout 50598e9058 pathlib cleanups 2019-03-10 21:01:39 +00:00
Philip Ridout 07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Philip Ridout 87216707d3 Test fixes 2019-03-09 06:58:52 +00:00
Ken Roberts eb8864f569 Minor cleanups 2019-03-08 19:53:20 -08:00
Philip Ridout 11aa69c9ac PEP fixes 2019-03-08 21:25:16 +00:00
Philip Ridout fc8255d658 PEP fixes 2019-03-08 21:00:16 +00:00
Ken Roberts cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08:00
Tomas Groth 07ebc22fa7 Update the appveyor build script. Fix various bugs that caused the frozen app from working.
bzr-revno: 2848
2019-03-07 21:51:00 +01:00
Tomas Groth b6a36f2324 pep8 fixes 2019-03-07 20:23:04 +01:00
Bob Luursema 490f9bbe15 Fix linting 2019-03-05 22:21:12 +01:00
Bob Luursema 40ceb07f18 Hotfix 2019-03-05 22:02:49 +01:00
Bob Luursema c68d6dc3de Fixed bug 1800761 2019-03-05 21:55:37 +01:00
Bob Luursema 2a6378f489 Almost fixed bug 1800761 2019-03-04 21:37:11 +01:00
Tomas Groth d7e4798b96 trunk 2019-03-04 21:33:43 +01:00
Philip Ridout 07ffb7c0d0 Fix choruses, bridges & etc. being imported as verses in CCLI txt files 2019-03-03 13:32:31 +00:00
Philip Ridout c761592095 Catch some OSErrors to provide user friendly error messages. Few other minor fixes
Fixes: https://launchpad.net/bugs/1650910
2019-03-03 09:49:01 +00:00
Philip Ridout 670c06db60 Add proxy settings button to FTW, ftw refactors, a few fixes! 2019-02-27 21:12:16 +00:00
Tomas Groth fb02d06a09 make the path of display web file work on frozen apps 2019-02-27 21:17:00 +01:00
Samuel Mehrbrodt 94fa2e912a Fix songbook as first slide display 2019-02-22 08:34:40 +01:00
Philip Ridout 67be698ad2 Fixes 2019-02-21 21:29:00 +00:00
Samuel Mehrbrodt fcf4cb1c5c Merge trunk 2019-02-21 22:26:36 +01:00
Tomas Groth c241b28039 put debug in the log 2019-02-19 22:38:44 +01:00
Tomas Groth 0d66070879 build both 32 and 64 bit, and add debug print 2019-02-19 21:46:31 +01:00
Philip Ridout bd99cee8fd minor changes 2019-02-16 08:57:11 +00:00
Philip Ridout 5a32b40653 pep again! 2019-02-15 22:54:45 +00:00
Philip Ridout 5fdebcb7a6 change select all icons. fix wordwrap 2019-02-15 22:34:53 +00:00
Philip Ridout de89167a33 url change 2019-02-15 20:56:15 +00:00
Philip Ridout 9b2ef7d8f7 PEP8 2019-02-15 20:47:09 +00:00
Philip Ridout 6d7c19256b Fixes 2019-02-15 20:22:02 +00:00
Philip Ridout 8bc6cfc1a5 HEAD 2019-02-15 20:12:59 +00:00
Philip Ridout 097225c9d7 Code change for json config file. Titulate themes ftw page 2019-02-15 20:12:28 +00:00
Tomas Groth aa982492e4 Implement going to the previous serviceitem. 2019-02-15 20:33:43 +01:00
Tomas Groth b10aa24119 Attempt to fix appveyor tests 2019-02-14 22:19:26 +01:00
Tomas Groth ad0eacd4f0 merge trunk 2019-02-14 20:49:32 +01:00
Tim Bentley fc579f120a Head 2 2019-02-14 19:42:34 +00:00
Tim Bentley c0d328dc06 Head 2019-02-14 19:40:35 +00:00
Tomas Groth fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
Raoul Snyman d99c2f6996 Migration from WebKit to Webengine. Also introduced reveal.js for slide rendering, new screen setup dialogs and many other changes.
bzr-revno: 2844
2019-02-14 00:04:30 -07:00
Raoul Snyman 465ff767d6 Fix an unused import and some incorrect patch()s 2019-02-13 14:36:37 -07:00
Tomas Groth 5ac8bbc3f2 Even more pep8 fixes and removed the old htmlbuilder. 2019-02-13 22:19:24 +01:00
Tomas Groth 27f37df7e8 More pep8 fixes 2019-02-13 21:54:35 +01:00
Tomas Groth 31ed94d88c pep8 fixes 2019-02-13 21:28:10 +01:00
Tomas Groth 927b68dc95 Fix more tests 2019-02-13 20:41:10 +01:00
Tomas Groth 2219f1f65f Updated reveal.js to 3.7.0 2019-02-11 21:34:20 +01:00
Samuel Mehrbrodt 99f0d37253 Remove blank lines 2019-02-08 14:39:40 +01:00
Samuel Mehrbrodt cf8feead1b Merge trunk 2019-02-08 12:22:39 +01:00
Kyle Nweeia 652b94e1ac Fixed bug #1678632 - SongSelect Importer Infinite Loop.
bzr-revno: 2843
Fixes: https://launchpad.net/bugs/1678632
2019-02-06 21:34:55 +01:00
Tomas Groth 2e93377cd3 Fix a few tests. 2019-02-06 21:26:33 +01:00
Philip Ridout 4ea2578cff Rework FTW to use ScreeenSelectionWizard 2019-02-06 20:07:01 +00:00
Tomas Groth 4489feb935 Added the text slide footer 2019-02-05 22:26:30 +01:00
Tomas Groth 82fa94857f Fix pagination 2019-02-02 22:02:33 +01:00
Tim Bentley 8de6ff8832 Fixed trunk merge so now matches that. 2019-01-31 21:34:20 +01:00
Tomas Groth 128ae7948b Workaround for image thumbnails not being displayed correctly in the slidecontroller. 2019-01-30 21:11:32 +01:00
Raoul Snyman 62b0eedfc6 Get Pyro working again 2019-01-30 00:18:03 -07:00
Raoul Snyman 64251747fb HEAD 2019-01-29 10:27:34 -07:00
Tim Bentley 5c9e47d977 Add settings tab 2019-01-28 08:31:37 +00:00
Tomas Groth 728dcfba78 Fixed a traceback when saving in the screentab. 2019-01-27 21:01:02 +01:00
Tim Bentley 2f43ec5cf0 more fixes 2019-01-27 16:33:12 +00:00
Tim Bentley 2cae002824 cleanups 2019-01-27 14:52:06 +00:00
Tim Bentley f1c7664125 Merge media trunk and fix up 2019-01-27 14:42:23 +00:00
Philip Ridout af41798128 Make screen selection reusable 2019-01-26 08:17:07 +00:00
Tim Bentley 77f84e2b95 More stream stuff 2019-01-20 21:54:26 +00:00
Tim Bentley 469a888563 clean ups and settings 2019-01-20 17:58:41 +00:00
Tim Bentley 168efffb60 Move settings 2019-01-20 16:20:45 +00:00
Tim Bentley 8ed4216975 settings updates 2019-01-20 09:29:47 +00:00
Tim Bentley 59d61d6c9b fix 2019-01-11 20:23:24 +00:00
Tim Bentley 5b7beffe64 fix code 2019-01-10 22:01:07 +00:00
Tim Bentley e39cad307b fix code 2019-01-10 21:20:44 +00:00
Tim Bentley 807e6a843d Fix doc strings 2019-01-08 19:30:28 +00:00
Tim Bentley 5299cc27f5 pep8 2019-01-04 20:50:40 +00:00
Tim Bentley fb978fca99 pep8 2019-01-04 20:39:05 +00:00
Tim Bentley 588fc947c3 pep8 2019-01-04 20:30:34 +00:00
Tim Bentley 392bfba099 pep8 2019-01-04 20:11:12 +00:00
Tim Bentley c2a03e205d try again 2019-01-04 18:21:38 +00:00
Tim Bentley 26f549cd9e try again 2019-01-04 18:17:39 +00:00
Tim Bentley 72cd432f10 try again 2019-01-04 18:11:15 +00:00
Tim Bentley f0108d89fc try again 2019-01-04 18:05:17 +00:00
Tim Bentley da73e2f762 for fixes 2019-01-03 22:08:13 +00:00
Tim Bentley df3bbc1ec0 fixes 2019-01-01 16:04:37 +00:00
Tim Bentley 3bfa92cd47 fix bits 2018-12-21 15:42:12 +00:00
Tim Bentley 7be849681a fix bits 2018-12-21 15:33:46 +00:00
Tim Bentley 0f538250b9 fixes 2018-12-15 08:31:16 +00:00