ed488621aa
Fix problem with new MediaShout test
2020-09-25 21:52:12 -07:00
Tim Bentley
844399b54f
Merge branch 'issue-62-rename-song-importer' into 'master'
...
Rename OpenLP 2.0 Song Importer
Closes #62
See merge request openlp/openlp!237
2020-09-24 07:12:25 +00:00
d18faa5233
Hopefully fix some confusion, fixes #62
2020-09-23 19:20:06 -07:00
74a72877d8
Fix two bugs in the MediaShout importer
...
- Fix a bug where the "Themes" table was never read due to an incorrect "if" statement
- Fix a bug where the "Groups" table was presumed to exist, but doesn't always (bug #35 )
2020-09-23 15:25:37 -07:00
Tim Bentley
ac161d79ed
Merge branch 'sept-2020' into 'master'
...
Fixes Sept 2020
Closes #633
See merge request openlp/openlp!231
2020-09-23 08:37:57 +00:00
Tim Bentley
09b57c3cd7
Stop videos playing if no VLC.
...
#633
2020-09-23 08:37:57 +00:00
0eadcc535f
Fix #434 by handling links with titles
2020-09-22 22:42:45 -07:00
Daniel
b5a2eef4e7
Fix api crash when sending thumbnail path
...
For things with thumbnails that aren't images (just presentations I think)
2020-09-23 04:50:09 +00:00
Daniel
b33d27f77c
Fix theme combo box not showing at start
...
The theme combo box did not show when the currently rendered item
doesn't support the service/song theme levels.
This changes the theme combo box to use the theme level from the
settings rather than the currently rendered item.
2020-09-20 17:35:49 +00:00
Tomas Groth
cd22bfaa51
Started work on support for powerpoint on mac. Changed the script execution approach from osascript to py-applescript. Not tested. At all.
2020-09-13 14:49:02 +00:00
Fernando Quant
0a64cc95ec
Themes api get_themes returns the preview image instead of the full background image in the theme_list
2020-08-27 06:19:47 +00:00
Tomas Groth
04feb3ee67
Fix image db upgrade
2020-08-18 06:47:02 +00:00
Tim Bentley
6711cbee9d
Merge branch 'fix-font-file' into 'master'
...
Remove the references to FontAwesome, this file does not contain FontAwesome at all
See merge request openlp/openlp!228
2020-08-15 13:38:32 +00:00
Gyuris Gellért
7df43c7dfb
Add solution to remove extra whitespaces from OL <lines> tag
...
Related to #550
2020-08-13 19:40:14 +00:00
58e2e50610
Remove the references to FontAwesome, this file does not contain FontAwesome at all
2020-08-12 21:48:32 -07:00
a944791a70
Merge branch 'ccli_fix' into 'master'
...
Fix CCLI with the QT WebEngine
See merge request openlp/openlp!214
2020-08-06 02:26:56 +00:00
Daniel
483f14ec15
working webview implementation of the ccli importer
...
Still a WIP:
- I'll add the old preview thing
- Need to make default size of the window larger
- Need to make UI look better
2020-08-06 02:26:56 +00:00
Tomas Groth
8fe519cada
Merge branch 'bibleversionapi' into 'master'
...
Bible version api
See merge request openlp/openlp!220
2020-08-01 19:34:08 +00:00
Fernando Quant
acb6e892a9
Bible version api
2020-08-01 19:34:08 +00:00
Tomas Groth
ec85f1f8b9
Merge branch 'readd_custom_stage_views' into 'master'
...
Re-add custom stage view support
See merge request openlp/openlp!223
2020-08-01 19:32:29 +00:00
Tomas Groth
c6c5f77b03
Merge branch 'add_footer_to_web_api' into 'master'
...
Add theme data and footer to web api
Closes #537
See merge request openlp/openlp!224
2020-08-01 19:30:49 +00:00
Daniel
fc16e0009e
Add footer to the object returned in the api
...
This is about the only thing left preventing us from running the main web view on react in a similar way the primary display is run. (rather than screenshots)
2020-08-01 19:30:49 +00:00
Daniel
e7ffa35000
Actually 'unregister' closed websocket connections
...
The recv method will trigger an Exception when the user disconnects
from the server, which means we can unregister them and break the loop.
2020-08-01 19:28:19 +00:00
Daniel
f69887cd8c
Re-add custom stage view support
...
Almost a static server. Lets say your stage files are in `stages/mystage/<files>`,
Provided your main html file is named `stage.html`, you can get to it with:
`<openlp_ip>:<openlp_port>/stage/mystage` (this is the same as openlp 2.4.6)
Although you can use the full url, the `stage.html` will be able to directly
link to it's neighbour files with a relative url. (that means you can use
`javascript.js` rather than `/stage/mystage/javascript.js`)
Again, this should be the same as openlp 2.4.6
I think OpenLP 2.4.6 used some sort of template system to fill in the page
title and perhaps a few other things. This does not use a template system
and you only need a standard html file.
2020-07-25 21:41:28 +12:00
Tim Bentley
a036362237
Merge branch 'fix_change_image_bg_crash' into 'master'
...
Fix plugin crash if they don't implement config_update
Closes #623
See merge request openlp/openlp!222
2020-07-25 06:40:22 +00:00
Daniel
238088d50b
Add config_update as an overrideable plugin fn
2020-07-25 11:53:11 +12:00
5620a6f57f
Expose the entire ServiceItem in the API
...
- Move JSON rendering into ServiceItem object
- Provide entire service item object through API
- Fix some potential bugs and write tests
2020-07-23 17:19:49 -07:00
Tomas Groth
73221cef9b
Remove and add screens without reloading screens. Do not show screen-change-popup when the settings form is visible.
2020-07-21 20:05:59 +00:00
Tomas Groth
66cf59767a
Merge branch 'allow-PIs-in-openlyrics-importer' into 'master'
...
Allow XML processing istructions in OpenLyrics importer
Closes #548
See merge request openlp/openlp!188
2020-07-13 08:48:33 +00:00
Gyuris Gellért
8edce313bc
Allow XML processing istructions in OpenLyrics importer
2020-07-13 08:48:33 +00:00
Tomas Groth
cad3661c56
Refactor the appveyor setup
2020-07-10 19:45:00 +00:00
Mattias Põldaru
65f7af0e9f
Revert recently introduced bug causing video background to be on top of lyrics. The crash this was supposed to fix is no longer present.
2020-07-08 20:15:37 +00:00
Tim Bentley
4ffd7f5a6f
Merge branch 'remove-font-license' into 'master'
...
Remove an unnecessary license file
See merge request openlp/openlp!216
2020-07-06 06:25:57 +00:00
6c5bcf4b03
Remove an unnecessary license file
2020-07-03 22:39:31 -07:00
5c0082e434
Fix the colour of the icons on macOS
2020-07-03 22:18:17 -07:00
Tim Bentley
28a7840b9f
Merge branch 'dynamic_themes' into 'master'
...
Dynamic themes
See merge request openlp/openlp!200
2020-07-01 16:12:01 +00:00
Daniel
59c0aba7fb
Set default header and footer areas if not overridden
...
Do this every time the theme is read from file or the display resolution changes
2020-07-01 16:12:00 +00:00
Tim Bentley
5b20945c34
Merge branch 'fix_progress_bar_crash' into 'master'
...
Fix large service file crash
Closes #594
See merge request openlp/openlp!213
2020-07-01 16:10:28 +00:00
Daniel
f6b4f8229e
scale service save progress increments to thousandths
...
(Progress bar size == 1000 rather than a potential int overflow using the file size)
2020-07-01 16:10:28 +00:00
Daniel
357fe20c91
Fix incorrect image title from loading service
...
This fixes the crash when you select a image loaded from a service file
2020-07-01 16:09:44 +00:00
Tim Bentley
0f43a84ff3
Fix Image Backgounds and remove Image Manager
...
Resolves ##480
2020-06-21 07:17:35 +00:00
Tim Bentley
f8d747e236
Fix Image Backgounds and remove Image Manager
...
Resolves ##480
2020-06-20 06:06:31 +00:00
Tim Bentley
d117430175
Merge branch 'websockets' into 'master'
...
Upgrade and cleanup WebSocket code
See merge request openlp/openlp!208
2020-06-17 19:09:05 +00:00
Tim
e6fa02a75e
Upgrade and cleanup WebSocket code
2020-06-17 14:49:31 +01:00
Tomas Groth
8765b0045c
Various alpha2 fixes
...
* Fix BibleGateway integration.
* Fix traceback when cloning song.
* Fix traceback when running portable build.
2020-06-13 21:36:38 +02:00
Tim Bentley
a55fdbf0c8
Update API definition
...
resolves #295
2020-06-10 20:10:56 +00:00
Tim Bentley
6eba3b7a3e
Settings cleanup
2020-06-06 16:05:36 +00:00
55a9070140
Release 2.9.1
2020-05-30 15:36:11 -07:00
Tomas Groth
01fac492e9
A few image related fixes.
...
* Use the image itself as a thumbnail if none is available, fixes #547
* Store the thumbnail path in service files, no matter if light or not.
* Added convertion of image thumbnail to sha256 as part of DB upgrade.
2020-05-30 20:57:29 +00:00
771d579147
Merge branch 'fixes2' into 'master'
...
No internet traceback
Closes #572
See merge request openlp/openlp!202
2020-05-30 06:35:09 +00:00
