a17039ba30
Fix a bunch of tests and warnings
...
Some of the song import tests were not being run, and pytest was warning
about them. I refactored them so that pytest would run them again.
Also, there were some other warnings in the code about deprecations, so
I fixed as many of those as I could too.
2020-09-28 23:24:16 -07:00
Tomas Groth
3e8d57db6a
Various fixes for beta1
2020-09-26 23:40:29 +00:00
Tim Bentley
d41e0316f4
Merge branch 'fix-macos-pdfcontroller-test' into 'master'
...
Fix the PDF Controller tests on macOS
See merge request openlp/openlp!240
2020-09-26 20:06:34 +00:00
52e9daaf5d
Fix the PDF Controller tests on macOS
2020-09-25 22:06:45 -07:00
ed488621aa
Fix problem with new MediaShout test
2020-09-25 21:52:12 -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
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
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
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
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
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
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
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
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
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
Mattias Põldaru
2e58939382
Change preview/live left/right icons to up/down, as the slides are shown in preview, and just as keyboard shortcuts.
2020-05-26 20:29:05 +00:00
Daniel
b4648ee618
Fix preview flicker
...
fixes #553
This line is not needed as the display will move
to the first slide by default.
2020-05-25 05:01:12 +00:00
Daniel
59ab4a1ad4
remove unused themes/wrap footer setting
...
Maybe add a new theme attribute for this later
2020-05-21 20:17:03 +00:00
8d58fb76ca
Merge branch 'fixes' into 'master'
...
Random fixes
See merge request openlp/openlp!191
2020-05-18 18:00:42 +00:00
Mattias Põldaru
4c2c7b6ab1
Various fixes:
...
- Remove a traceback on exiting OpenLP
- Add back toolbar separator
- Fix biblegateway webpage parsing for tests
- Remove live_display argument from VlcPlayer.setup, is incorrectly passed the preview value
2020-05-18 18:00:40 +00:00
181b4fdcc9
Fix various issues and return current theme in API:
...
- New API method to return current theme
- Use single method to set service items via both position and uuid
- Update tests to match above new features
- Fix issue where chords were not being returned to the API
- Fix the clear/backspace icon (the old one doesn't exist in Debian)
2020-05-15 23:11:55 -07:00
Tomas Groth
b2843c50a1
Various small fixes
...
* Correctly hide network stream button in the theme background page.
* Fix traceback in the FTW due to the mainwindow (which is not yet created) being used.
2020-05-08 05:44:41 +00:00
Tomas Groth
63de3d2021
Merge branch 'view_mode_radio_buttons' into 'master'
...
View mode radio buttons
Closes #483
See merge request openlp/openlp!168
2020-05-07 06:51:29 +00:00
Daniel
9ac001e8e3
Change live toolbar to use radio buttons
...
Also removed the `live -> preview` button
Simplified button handler functions (removing duped code)
Set new showScreen shortcut to spacebar
Removed desktopScreenEnable button and shortcut
2020-05-07 06:51:29 +00:00
8ca3b08880
Merge branch 'liveworship-change' into 'master'
...
Liveworship import change
See merge request openlp/openlp!180
2020-05-07 05:19:20 +00:00
Tomas Groth
b3298d69f4
Liveworship import change
2020-05-07 05:19:20 +00:00
Tomas Groth
937c6c3e81
New service file format
2020-05-07 05:18:37 +00:00
Mattias Põldaru
e95ee62574
Fix errors in translatable texts.
2020-05-05 18:17:21 +00:00
Tim Bentley
2223a56268
Logging and Powerpoint fixes
2020-05-02 18:53:56 +00:00
