Commit Graph

7665 Commits

Author SHA1 Message Date
Phill dd0d531be3 Fix images 2019-05-23 20:33:46 +01:00
Phill d178b7adba Tidy ups + doc 2019-05-22 21:46:51 +01:00
Raoul Snyman ebc6e69668 Fix linting and remove duplicated VLC path env var 2019-05-22 09:59:58 -07:00
Raoul Snyman ca5e46eb49 HEAD 2019-05-22 09:47:20 -07:00
Phill 5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Tomas Groth 3d8d573389 Always make sure the powerpoint slide index map is created 2019-05-21 22:07:25 +02:00
Tomas Groth 1d71cb83ba merge trunk 2019-05-20 21:56:29 +02:00
Ken Roberts fa7e8f9d3c PJLink 2 Update v07
bzr-revno: 2871
2019-05-20 20:25:33 +01:00
Raoul Snyman f74e0c7dc8 Revert some changes from the HEAD merge; Add the lib directory to sys.path for running tests 2019-05-17 23:04:20 -07:00
Raoul Snyman 8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
Ken Roberts 0c14ddf31f PJLink2 Update v07 2019-05-11 02:07:40 -07:00
Raoul Snyman bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Tim Bentley e2acc386b7 remove commented out code 2019-05-08 15:09:54 +01:00
Tim Bentley 9e22ed86e3 remove unneeded test 2019-05-08 14:58:06 +01:00
Tim Bentley 7ed4581a3f head 2019-05-07 18:04:52 +01:00
Ken Roberts b4d5425887 PJLink2 Update v06
bzr-revno: 2869
2019-05-07 17:57:35 +01:00
Ken Roberts 984e79faa9 PJLink2 Update v05
bzr-revno: 2868
2019-05-07 17:57:02 +01:00
Phill 0f640368e1 Just to trigger the tests :-)
bzr-revno: 2867
2019-05-07 17:56:21 +01:00
Raoul Snyman d6227ea582 HEAD 2019-05-06 22:07:18 -07:00
Raoul Snyman 236bc73e59 Fix an issue with changing the data folder; Include QDarkStyle when building Windows installer 2019-05-06 22:06:29 -07:00
Tomas Groth 8f48fa26e9 head 2019-05-05 20:41:17 +02:00
Tim Bentley 54aea66a16 initial version 2019-05-05 09:13:10 +01:00
Tim Bentley 22db084375 fix missing vlc 2019-05-05 06:59:29 +01:00
Ken Roberts 855828939f PJLink2 update v06 2019-05-04 21:08:32 -07:00
Tim Bentley a7821bdd26 rename additions to arguments 2019-05-04 20:47:06 +01:00
Tim Bentley 3526c3de64 Head 2019-05-04 20:29:20 +01:00
Phill 3ee9df96ae PEP8 2019-05-04 19:25:59 +01:00
Phill 1d736a58f5 Fix up tests 2019-05-04 13:05:53 +01:00
Phill 7aa7e5c635 Move some changes out of annother branch 2019-05-04 12:49:20 +01:00
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
Raoul Snyman 46bb693d18 Fix command line args 2019-05-02 11:59:09 -07: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
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
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 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
Phill 98f7c28d65 Add proxy settings to ftw. Option to skip sample data
bzr-revno: 2853
2019-03-28 22:03:32 +01:00
Tomas Groth 2ebccbfb91 trunk 2019-03-27 21:33:21 +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 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 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 b6a36f2324 pep8 fixes 2019-03-07 20:23:04 +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
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