Commit Graph

12758 Commits

Author SHA1 Message Date
robbiejackson 9e0294024b fix preview video restart after pause or stop 2021-02-21 21:17:57 +00:00
Tomas Groth 8123f9d920 Merge branch 'fix-setting-custom-geometry' into 'master'
Fix setting custom geometry

See merge request openlp/openlp!304
2021-02-20 21:32:16 +00:00
robbie jackson febf2615b5 Fix setting custom geometry 2021-02-20 21:32:16 +00:00
robbiejackson b76045e783 changed CCLI no access notification to be in message area 2021-02-18 10:34:32 +00:00
Tim Bentley ed8da9512b Merge branch 'no-access-ccli' into 'master'
fix for CCLI song select when the user's account has no access to the song

See merge request openlp/openlp!299
2021-02-17 07:33:38 +00:00
robbie jackson 5ed56e388a fix for CCLI song select when the user's account has no access to the song 2021-02-17 07:33:37 +00:00
Tomas Groth 520362a469 A few beta1 fixes 2021-02-10 07:51:16 +00:00
Tim Bentley b0d8d6fd85 Merge branch 'Allow-sub-directories-in-custom-stages' into 'master'
Allow sub directories in custom stages

Closes #759

See merge request openlp/openlp!298
2021-02-06 15:48:39 +00:00
Daniel Martin a327b70dc5 Fix missing image service load crash 2021-02-06 15:48:08 +00:00
Daniel aeac690c4e Allow sub directories in custom stages 2021-02-04 09:56:52 +13:00
Daniel Martin 058bea7f4c Small fixes 2021-02-02 09:28:20 +00:00
Tomas Groth ec6015c7fb Merge branch 'standardize_plugin_search_options' into 'master'
Standardize plugin search options

Closes #737

See merge request openlp/openlp!296
2021-01-30 22:36:58 +00:00
Daniel Martin d47a14a716 Standardize plugin search options 2021-01-30 22:36:58 +00:00
Raoul Snyman 44901c4cf5 Merge branch 'Image_DragAndDrop' into 'master'
Fix bug #730 and #751 where DND images are loaded twice.

See merge request openlp/openlp!292
2021-01-30 06:03:05 +00:00
Raoul Snyman d465e692cd Merge branch 'master' into 'master'
Fix chapter count for Zechariah

See merge request openlp/openlp!291
2021-01-30 06:02:21 +00:00
Raoul Snyman 87bef4f934 Merge branch 'fix_songselect_non_english' into 'master'
Fix songselect for non english

Closes #752 and #723

See merge request openlp/openlp!293
2021-01-30 06:01:42 +00:00
Daniel Martin 81dc52110d Change song lyrics selector to fetch link via class name
And get copyrights via lyrics page where the list has a class name
2021-01-30 06:01:42 +00:00
Raoul Snyman 9975ad4e43 Merge branch 'fix_auto_unblank' into 'master'
Fix auto unblank

Closes #729 and #181

See merge request openlp/openlp!294
2021-01-30 05:59:57 +00:00
Daniel Martin ed129b8923 Fix auto unblank 2021-01-30 05:59:56 +00:00
Daniel Martin 837b62ce39 Make images fullscreen 2021-01-30 05:02:57 +00:00
Tim 7c57f1168d
Fix bug #730 and #751 where DND images are loaded twice. 2021-01-28 14:01:09 +00:00
Sean DeArras 8e9150ba2a Fix chapter count for Zechariah 2021-01-24 13:56:17 -08:00
Tomas Groth 282a845a10 Fixes for the bible plugin. Fix placement of alternative_book_names.sqlite for portable installs. Fix gui elements not updating when only one bible is available. 2021-01-21 07:59:34 +00:00
Tim e682f39fe6
Fix bug #740 where plugin is not loaded. 2021-01-18 15:44:43 +00:00
Daniel Martin da31226029 Fix http poll routes 2021-01-08 15:01:53 +00:00
Tomas Groth 9194273341 Merge branch 'enable_qt_dpi_scaling' into 'master'
Enable QT DPI scaling

See merge request openlp/openlp!287
2021-01-03 17:37:20 +00:00
Tomas Groth 561745166a Merge branch 'fix_#713' into 'master'
Fix #713 - Bible Combo Crash

Closes #713

See merge request openlp/openlp!284
2021-01-03 17:34:39 +00:00
Tim Bentley b27f0c69d7 Fix #713 - Bible Combo Crash 2021-01-03 17:34:39 +00:00
Daniel Martin 7b8c4a31c9 Prevent empty slides being added
And some comments and grammer
2021-01-03 14:32:00 +00:00
Daniel c8c2c41641 enable qt dpi scaling 2020-12-31 20:23:58 +13:00
Tim Bentley aade849aca End of 2020 - Just change the Year! 2020-12-30 21:42:49 +00:00
Raoul Snyman 5211a9249d
Release 2.9.2 2020-12-20 20:51:59 -07:00
Raoul Snyman b5da7b8e74 Merge branch 'fix_song_and_image_upgrade_sql_error' into 'master'
Fix apostrophe issue

Closes #699 and #698

See merge request openlp/openlp!276
2020-12-20 21:12:38 +00:00
Raoul Snyman 3a83c210ba
Update our code to support newer versions of PyMuPDF 2020-12-20 09:45:37 -07:00
Daniel 08478732d0 use sql parameters to insert file names
fixes sql injection issues
2020-12-20 19:31:05 +13:00
Raoul Snyman cbf37ce8b3
Refactor the settings somewhat
- Created a new Service tab
- Moved service-specific items to service tab
- Moved UI settings to general tab
- Did some general UI cleanup

Update/add tests
2020-12-17 16:13:05 -07:00
Raoul Snyman 8bf07cff64
Fix a bug in the screens code 2020-12-02 23:08:15 -07:00
Daniel 9a1605694a Remove image background setting
Background images never needed this because they expand to fit
Foreground images will get a theme background
2020-11-24 20:23:35 +00:00
Tim Bentley a9f2bf1461 Two text fixes and a PDF startup error 2020-11-20 14:26:38 +00:00
Tomas Groth 0b739159b1 Merge branch 'mediainfo' into 'master'
Drop mediainfo system() support

See merge request openlp/openlp!258
2020-11-18 08:45:13 +00:00
Raoul Snyman 83e0d728e4 Merge branch 'beta_fixes_2' into 'master'
Video/VLC fixes

Closes #679

See merge request openlp/openlp!259
2020-11-17 03:59:39 +00:00
Daniel 06e0d9d522 Add a delay to closing vlc
This gives time for the web engine to appear, preventing any flicker to the desktop
2020-11-17 03:59:38 +00:00
Raoul Snyman 601fa58594
Fix some upgrade issues
- Fix an issue with loading screens from older versions of OpenLP (fixes #655)
- Fix an issue where presentations that no longer exist throw an error
- Fix a bug in the serialization of Path objects for Pyro4
- Add some tests for untested scenarios
- Fix some tests
2020-11-15 23:40:07 -07:00
Fernando Quant ae5c5b204a Fix theme api 2020-10-28 04:06:56 +00:00
Tim Bentley f47a168733 Merge branch 'beta_fixes_4' into 'master'
Fix first run issues

Closes #683 and #682

See merge request openlp/openlp!262
2020-10-20 11:32:48 +00:00
Daniel eb3dc6b221 Fix first run issues 2020-10-20 11:32:48 +00:00
Tomas Groth 6bbaa17646 Merge branch 'fixes_oct2020' into 'master'
Fixes and Updates

See merge request openlp/openlp!263
2020-10-19 07:18:27 +00:00
Tim Bentley 1c4ae35c9c Fixes and Updates 2020-10-19 07:18:26 +00:00
Daniel fd7ba2a447 Song details api 2020-10-19 07:18:00 +00:00
Daniel 5dea23662a Fix web api issue and crash with small theme
Potentially fixes some other issues we didn't know about too...
This just stops anything interfering with creating slides,
and stops fetching the slides halfway through processing
2020-10-09 06:26:28 +00:00
Bastian Germann 8f934c6695 Drop mediainfo system() support
Drop the support to call the mediainfo binary that is not included in the
installers anymore.
2020-10-06 17:37:48 +02:00
Raoul Snyman 47261d206b
Try to fix some font issues
- Closes #39
2020-10-04 23:22:31 -07:00
Tomas Groth c8b328c4f5 Merge branch 'distutils' into 'master'
Get rid of distutils

See merge request openlp/openlp!247
2020-10-04 20:52:05 +00:00
Tim Bentley b367015342 Merge branch 'master' into 'master'
Clean PDF Controller and its tests

See merge request openlp/openlp!245
2020-10-04 19:41:14 +00:00
Tim Bentley 6aea6a9d2d Merge branch 'bugs' into 'master'
presentations: Prevent check_available returning None

See merge request openlp/openlp!252
2020-10-04 19:40:31 +00:00
Tim Bentley 867779da43 Stop videos playing if no VLC.
#633
2020-10-04 19:20:10 +00:00
Tim Bentley 13f47d2a92 Merge branch 'fix_live_controls_toolbar' into 'master'
Fix live controls toolbar

See merge request openlp/openlp!255
2020-10-04 06:32:08 +00:00
Daniel bee733d016 Fix live controls toolbar 2020-10-04 06:32:07 +00:00
Daniel 0a174bc6b7 Beta fixes 2020-10-04 06:31:30 +00:00
Raoul Snyman feda35ee1e Merge branch 'fix_screenshot_freeze' into 'master'
Fix screenshot freeze

Closes #666

See merge request openlp/openlp!251
2020-10-02 04:57:17 +00:00
Daniel bd0308f1b4 Ignore transition speed when no transitions
Also add/fix tests
2020-10-02 04:57:17 +00:00
Raoul Snyman ae7ac7bf35 Merge branch 'ppt-fixes' into 'master'
Powerpoint fixes

See merge request openlp/openlp!250
2020-10-02 04:49:49 +00:00
Tomas Groth 48c3a0ca4a Powerpoint fixes 2020-10-02 04:49:49 +00:00
Tomas Groth 64b62c4f59 Implement support for windows 10 dark mode, fixes #370. 2020-10-02 02:18:39 +00:00
Bastian Germann a0a67f5917 presentations: Prevent check_available returning None 2020-09-29 23:42:16 +02:00
Raoul Snyman 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
Bastian Germann dc967baf00 Get rid of distutils 2020-09-29 01:22:28 +02:00
Bastian Germann 2c577e2382 Remove unused check_binary_exists 2020-09-28 22:38:22 +02:00
Bastian Germann 04e3ef5d86 Clean pdfcontroller from mupdf/ghostscript 2020-09-28 22:17:50 +02:00
Tomas Groth 8c888b9a00 Merge branch 'distutils' into 'master'
Replace distutils.dir_util.copy_tree with shutil.copytree

See merge request openlp/openlp!242
2020-09-28 07:12:29 +00:00
Bastian Germann 5e981be6fe Relicense GPL-2 files
There are still some leftovers or new files that are still GPL-2 licensed.
Relicense them according to the contributors' agreements to change the
license to GPL-3+.
2020-09-27 14:53:27 +02:00
Bastian Germann 1473ff5d4a Replace distutils.dir_util.copy_tree with shutil.copytree 2020-09-27 13:59:56 +02:00
Tomas Groth 3e8d57db6a Various fixes for beta1 2020-09-26 23:40:29 +00:00
Tim Bentley bd32b892f2 Merge branch 'fix-crosswalk-bibles' into 'master'
Fix the CrossWalk Biblestudytools.com importer

See merge request openlp/openlp!241
2020-09-26 20:05:42 +00:00
Raoul Snyman 7734ce89a0
Fix the CrossWalk Biblestudytools.com importer 2020-09-25 23:13:10 -07:00
Raoul Snyman 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
Raoul Snyman d18faa5233
Hopefully fix some confusion, fixes #62 2020-09-23 19:20:06 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 58e2e50610
Remove the references to FontAwesome, this file does not contain FontAwesome at all 2020-08-12 21:48:32 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 6c5bcf4b03
Remove an unnecessary license file 2020-07-03 22:39:31 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Mattias Põldaru 0419e80aec No internet traceback 2020-05-30 06:35:09 +00:00
Mattias Põldaru 7f4f6a2bfa Fix a freeze on Windows 2020-05-30 06:33:39 +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
Tim Bentley 67f4a0cc81 Resolve issues with theme changes.
Add new clear api's
2020-05-20 07:40:23 +00:00
Raoul Snyman 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
Raoul Snyman 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
Tim Bentley 6876bbd531 Clean up Apis and remove duplicate files.
Add new API to help testings
2020-05-16 06:11:21 +00:00
Tomas Groth da373ef1d5 Fix a traceback to wrongful path to string convertion 2020-05-10 22:04:13 +02:00
Tim Bentley 1f9884e64a Merge branch 'web_remote_fixes' into 'master'
Change server send correct files for new web-remote

Closes #516

See merge request openlp/openlp!184
2020-05-08 08:26:06 +00: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
Daniel 58b622a196 Change server send correct files for new web-remote 2020-05-08 13:04:38 +12: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
Raoul Snyman 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 ca6ed027d3 Merge branch 'alpha-fixes5' into 'master'
Fix loading optical and streaming items from servicemanager.

See merge request openlp/openlp!178
2020-05-02 20:10:24 +00:00
Tim Bentley 2223a56268 Logging and Powerpoint fixes 2020-05-02 18:53:56 +00:00
Tomas Groth 1fb99e543e When creating media service items, validate items after adding capabilities. Fixes loading optical and streaming items from servicemanager. 2020-05-02 14:04:53 +02:00
Raoul Snyman d4f75e4fb4 Merge branch 'smooth_transparency_transitions' into 'master'
Smooth transparency transitions

Closes #507

See merge request openlp/openlp!169
2020-04-27 16:20:53 +00:00
Daniel f4e30c15cc Always use transparency when going to desktop
Except when the display workaround is enabled of course :)
2020-04-27 16:20:51 +00:00
Tomas Groth 3de2435631 Fix loading PDF items from the servicemanager
In slidecontroller::_process_item a copy was made of the serviceitem, but it wasen't always used, which caused issues since that item was converted from a presentation/command item to an image item for PDFs.
2020-04-27 11:50:34 +00:00
Tim Bentley da01b2a8f2 Api improvements 2020-04-26 21:37:35 +00:00
Raoul Snyman 901a41b87b
Make OpenLP download version files from get.openlp.org; fixes #471 2020-04-23 22:57:12 -07:00
Daniel 3a93e52d2c Remove global background
Add new "global" background as checker board for non displays.
2020-04-20 20:13:11 +00:00
Tomas Groth b14424a0df Merge branch 'fix_slow_preview_after_fetching_live-image' into 'master'
Fix slow preview after fetching live image

Closes #504

See merge request openlp/openlp!166
2020-04-10 18:25:12 +00:00
Daniel a02ca297d6 Fix slow preview after fetching live image 2020-04-10 18:25:12 +00:00
Tim Bentley 42e6640339 Cleanups, add missing theme functionality 2020-04-09 21:55:27 +00:00
Raoul Snyman 6bbe01e7c9
Web Remote Version Checking and Downloads; Other Fixes
- Download the web remote as part of the FTW
- Add version checking for the web remote
- Always order the authors when exporting to OpenLyrics
- Write tests for a bunch of things.
2020-04-07 23:36:14 -07:00
Tim Bentley fb006dabcd Merge branch 'fix-unreadable-footer-380' into 'master'
Fix up the formatting of the contents of the help box

Closes #380

See merge request openlp/openlp!163
2020-04-04 06:51:02 +00:00
Daniel 4b50c6f5d2 fix core/logo hide on startup setting, fix display stuck as hidden and invert transparent display setting 2020-04-04 06:48:18 +00:00
Raoul Snyman efd97644c8
Fix up the formatting of the contents of the help box
- Fix #380
- Fix some tests
- Add some tests

Fix some tests, add some tests
2020-04-02 21:42:35 -07:00
Tomas Groth 73da7f8315 Merge branch 'alpha-fixes4' into 'master'
Fix presentation load from service file

Closes #481

See merge request openlp/openlp!162
2020-04-02 20:24:58 +00:00
Tomas Groth d1b051807b Fix presentation load from service file 2020-04-02 20:24:58 +00:00
Tim Bentley 3f41c852f2 Fix some race conditions, remove calls to ImageManager, fix a crash in the remote API, fix some more test issues. 2020-04-02 18:48:27 +00:00
Fernando Quant 5e4559cdb3 Added basic theme API 2020-04-01 18:26:57 +00:00
Raoul Snyman b85d6e0ded Merge branch 'tests_interfaces_1' into 'master'
Tests interfaces 1

See merge request openlp/openlp!158
2020-03-19 20:04:28 +00:00
Tim Bentley cbc9f8c8e2 Tests interfaces 1 2020-03-19 20:04:28 +00:00
Raoul Snyman 73507884fb
Refactor web remote deployment, plus other fixes and enhancements
- Refactor deployment away from the web server thread
- Refactor the web remote settings tab
- Provide a way for threads to show an error message to the user
- Fix an issue where multiple zeroconf services were being run instead of a single instance on multiple addresses
- Refactored the DownloadProcess dialog
- Fix the tests
2020-03-17 19:31:18 -07:00
Tim Bentley 4a667c77fc Merge branch 'api-return-on-empty-search' into 'master'
Always return a list when searching in the API

Closes web-remote#1

See merge request openlp/openlp!156
2020-03-14 17:00:09 +00:00
Daniel 48901cecfc always return a list when searching in the api
It is not a error when no search results are returned, it is to be expected. The api should return a empty list to show that there were no results (status code 200 OK) rather than a 400 (BAD REQUEST).
2020-03-11 13:22:37 +13:00
Tomas Groth 982b4470c7 Fix error when adding songs from services. 2020-03-10 21:40:39 +00:00
Raoul Snyman 050e49465e Merge branch 'fix_song_editor_crash' into 'master'
Fix song editor crash

Closes #459

See merge request openlp/openlp!150
2020-03-09 04:05:21 +00:00
Daniel 122596c6fb Don't call a non existent function (create_slides on a service item)
There is a private fn prefixed with a "_", but it's not needed as it is run when required (hence the reason it's private). If the slide vars did need to be regenerated, `render_text_items` is the way to do it.
2020-03-09 04:05:20 +00:00
Tim Bentley ef3ecfeaa9 Merge branch 'network-stream' into 'master'
Add support for network streams.

See merge request openlp/openlp!151
2020-03-08 22:05:10 +00:00
Tomas Groth 127ee05ac3 Add support for network streams. 2020-03-08 22:05:09 +00:00
Tim Bentley d43811f38d Tests plugin 3 - and Fix #272 2020-03-08 21:45:42 +00:00
Daniel d5892b6258 Don't reload images on start (they are already loaded)
Someone should check if the start param in this function is even needed now, looks like an artifact from the old renderer
2020-03-05 20:35:25 +00:00
Raoul Snyman 79950b6a85 Merge branch 'tests_plugin_1' into 'master'
Migrate Functional Plugin Tests Part 1

See merge request openlp/openlp!146
2020-03-04 06:06:47 +00:00
Tim Bentley 8fa698d510 More fixes for broken tests
Skip one which never worked but relied on data leakage!
2020-03-04 06:06:47 +00:00
Tomas Groth 5e6c20486a Update Reveal.js to 3.9.2 2020-03-03 21:26:16 +00:00
Daniel 11a68d36ad fix vertical positioning on text slides 2020-03-03 20:25:36 +13:00
Tim 7f7ac0f20d
Two broken functions found in testing. 2020-02-27 21:48:45 +00:00
Tim Bentley 5d821b1772 Fix appvoyer tests - we hope
Migrate UI to pytest and fix up all tests.
2020-02-19 06:23:17 +00:00
Tim Bentley 170c37d441 Revert "Migrate Media and add Pytest-qt"
This reverts commit 3dcac055be.
2020-02-12 20:28:33 +00:00
Raoul Snyman 0a22c7f77a Merge branch 'CCLI-fixes' into 'master'
CCLI fixes

Closes #245

See merge request openlp/openlp!132
2020-02-10 21:29:31 +00:00
Daniel b455077ff8 Allow searching past the first page of songs
Previously the first ten songs were just repeated
2020-02-10 21:29:30 +00:00
Tim Bentley 3dcac055be Migrate Media and add Pytest-qt
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-09 20:24:05 +00:00
Daniel 0b3ee4e1ba Fix common settings crash 2020-02-09 08:01:15 +00:00
Tim Bentley 7cdc2a68de Migrate Projectors
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-07 19:53:52 +00:00
Tomas Groth 11b24c8e1f Merge branch 'multiple-streams' into 'master'
Add support for multiple streams.

See merge request openlp/openlp!116
2020-02-04 20:35:35 +00:00
Tomas Groth d9b65d8873 Made the stream selector a lightweight version of the VLC capture device selector. Still some work to do. 2020-02-04 20:35:35 +00:00
Tomas Groth 442dc7d0d2 Deregister screen-updates to the theme widget when it closes. Fixes #320. 2020-02-03 23:03:24 +00:00
Tim Bentley 020661059f Migrate Display
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-01 21:12:07 +00:00
Tim Bentley 45e38c4959 Migrate API to Settings
Fix missing / incorrect copyright

Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-29 06:50:09 +00:00
Simon Hanna ef2f798f6f Update remote API to use Flask, and be more RESTful 2020-01-27 22:57:58 +00:00
Tim Bentley fa97550301 Migrate more plugins for settings
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-26 17:12:45 +00:00
Tim Bentley 86f85081b6 Migrate plugins from Settings() Alert and Bibles
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-21 16:59:46 +00:00
Tomas Groth 1ebc6737d7 Made the bibel and song import more robust.
Tested the importers by loading a text file, a png file and an xml file.
2020-01-18 21:45:47 +00:00
Tim Bentley debbced7e3 Update the plugin classes and remove the uneeded code
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-18 21:00:13 +00:00
Tomas Groth 3a2a3cba9a Merge branch 'fade-transition-speed' into 'master'
Theme fade transition speed

Closes #331

See merge request openlp/openlp!114
2020-01-18 14:07:40 +00:00
Raoul Snyman b85f1db06f
Properly detect chords, support >5 optional splits
- Properly detect only chords in square brackets
- Properly detect Bibles so that custom slides are rendered as text items
- Make more than 5 optional splits work (fixes #278)
2020-01-15 22:05:26 -07:00
Tim Bentley 8e9cc53852 Migrate media to new style tests
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-12 21:03:40 +00:00
Tomas Groth a0616ddf0f A few fixes for the alpha. 2020-01-06 21:15:11 +00:00
Tomas Groth e4377e9865 Use the _implementedInterfaces property on windows to signal the implementation of XSlideShowListener. 2020-01-04 21:31:04 +00:00
Tim Bentley 5aa2065741 Change Structure of OpenLP and move a test
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-04 21:24:32 +00:00
Tomas Groth c20b7f5301 Fix bibleserver integration. 2020-01-03 22:50:00 +01:00
Tim Bentley 6ea4893ad6 Change Year
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-01 02:53:08 +00:00
Daniel 3f38ccfd18 change fade transition speed and removed deprecated transitions 2019-12-31 09:08:40 +13:00
Tim Bentley 63f67f6e17 Migrate setting definitions to Core from plugins
Signed-off-by: Tim <tim.bentley@gmail.com>
2019-12-30 08:42:49 +00:00
Tim a9d4fb99dd
Fix file attributes 2019-12-24 06:50:18 +00:00
Tomas Groth b54a9931bd Fixes for the first Alpha:
* Handle git styled version tags/hashes instead of bzr. Fixes part of #351.
 * Fix planningcenter traceback, fixes #354.
 * Fix minor stuff detected by pylint.
2019-12-23 23:17:06 +01:00
Raoul Snyman 712bc5f54f Add VLC path to PATH environment variable 2019-12-21 22:03:17 +00:00
Daniel 0d16ce667f ThemeProgressForm show progress 2019-12-19 15:25:05 +00:00
Raoul Snyman 68f37e635a
Fix exception thrown due to a form not existing yet
- Fix an issue where an exception was thrown because the theme progress form didn't exist yet
- Refactor a few things
- Fix other tests
- Add a test for wait_for
2019-12-18 09:13:45 -07:00
Tim Bentley 01315795af Settings Refactor 4
- Fix breakage in editing songs
- Move the settings enums to a common location
- Fix broken tests.
2019-12-16 03:37:54 +00:00
Daniel 11dcf5b9ad Change transition direction 2019-12-14 11:44:42 +00:00
Daniel d00c9c8f11 Add time out to the loops and a delay in the second
Also add RegistryProperties, don't know how it was working without that
2019-12-12 01:03:35 +00:00
Raoul Snyman ec329eff2f Refactor the theme wizard into separate pages
- Refactor wizard pages into external page components
- Refactor form labels into a central label with the alignment already set
- Fix some tests
- Write more tests
2019-12-11 19:31:48 +00:00
Raoul Snyman 18303cdd0d Fix the path to QtWebEngineProcess on macOS 2019-12-10 16:57:30 +00:00
Raoul Snyman d5fc4c5b88 Display more detailed instructions when VLC and pymediainfo are missing
- On Fedora, mention the need for RPMFusion
- on macOS, reference the VLC website
- On other systems, just display a generic message
- Don't try to load the VLC path on macOS
2019-12-07 11:41:30 +00:00
Tomas Groth 507934e85c Disable BibleServer support for now since we haven't yet figured out how to extract available translations and books in translations. 2019-12-04 22:10:13 +00:00
Tomas Groth 64126cec23 Fix a traceback when trying to display a PDF 2019-12-04 20:46:10 +00:00
Tim Bentley 9fd6752a83 Try to fix paths in coverage report generation
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-12-04 20:01:02 +00:00
Raoul Snyman 771e97862f Add distribution detection in is_linux() function
- Optional argument to check Linux distro
- Add a test for the new argument
- Add some other tests to expand test coverage
- Remove Windows from testing
- If "distro" module is missing, create a replacement that returns False
2019-12-04 18:15:24 +00:00
Daniel 7c4d9a5ffd Time out after 10 seconds in wait till loaded fn
also fixes comment, update_preview_images() does not handle the timeout case but in reality it should never happen. (just in the case it does, it won't stall the whole application)
2019-12-03 17:30:35 +00:00
Daniel f8ae9cf719 Change theme_list in theme manager to a dictionary containing the theme objects
This prevents the need to read the theme file every time it's data is needed.
2019-12-02 18:07:41 +00:00
Ee Savior 5935bbe850 core-ui-media-__init__: Create test and fix docstring error for format_milliseconds(...). Achieve 100% coverage for __init__.py module 2019-12-02 18:02:13 +00:00
Tomas Groth 4f4de6249d Do not resolve paths, since it does not work as expected on windows. 2019-11-29 17:00:12 +00:00
Tim Bentley 8838e671fc Try to fix paths in coverage report generation
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-26 17:49:41 +00:00
Raoul Snyman 288a02344d Font selection widget
- Create a font selection widget
- Embed widget in the Theme wizard
- Add tests for the FontSelectWidget
2019-11-22 16:40:10 +00:00
Raoul Snyman 1c4052c627 Some small fixes
- Convert the return value of 'keys' to a list so that we have an actual copy of it
- Always resolve the path returned by AppLocation
2019-11-20 18:52:16 +00:00
Tim Bentley 02f41f794f Try to fix paths in coverage report generation
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-20 05:36:35 +00:00
John Morris 14b763d677 Corrected typos in 4 files 2019-11-15 16:26:08 +00:00
John Kirkland dbcdf11c0a Planningcenter plugin 2019-11-09 16:17:41 +00:00
Tim Bentley 35f7190e00 Try to fix paths in coverage report generation
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-11-03 21:17:47 +00:00
Raoul Snyman 06339426d2 Fix presentations on Linux (and hopefully Windows too) 2019-11-03 20:46:21 +00:00
Daniel 1ac6c052c7 Fix clone theme with missing background source 2019-11-02 07:14:10 +00:00
Raoul Snyman a019b42636 Force the display checkbox to be selected for at least 1 screen 2019-11-02 07:05:08 +00:00
Raoul Snyman f606838641 Pre-select a screen as the display if there is no screen config
- Force the last screen in the list to be the display screen by default
- Always select the first screen in the widget
- Increase the size of the FTW so that it stops jumping in size
- Add some more tests for the widgets
- Refactored widgets tests into a single file
- Fix #302 properly
2019-11-02 06:21:23 +00:00
Daniel a94449d8bc Fix display keypress issues 2019-11-02 05:21:01 +00:00
Tomas Groth 13dcff9aa7 Reuse the slidecontroller actions on the display window to enable
shortcuts to work for the display window. Fixes bug #286.
2019-11-01 20:49:14 +00:00
Raoul Snyman dd9701cb50 Fix issue #302 where theme previews were not being generated after the FTW
- Fix the theme preview generation to happen in the right place after the First Run Wizard
- Mock the settings in the DisplayWindow tests to see if that helps the Arch runner
- Add tests for the new form
2019-11-01 12:26:47 +00:00
John Morris 2f94f35a42 Configure Custom shortcut error fix 2019-11-01 11:04:44 +00:00
Daniel cef0e67bd2 Allow x11 override 2019-10-30 17:33:07 +00:00
Daniel 61cf097d45 Revert "Don't load images twice"
This is beyond the scope of this branch, I would leave this in, but there is a lot of strange code including commented code in this file, so I'm leaving it out. It would be a better idea to fix the whole file in another branch (or Tim might be fixing this file with the media fixes)
2019-10-29 22:54:14 +00:00
John Morris 5677cf6a40 Changed plugin search clear ICON 2019-10-29 16:13:18 +00:00
Daniel 76ff4be598 Fix "Use default location" buttons 2019-10-26 10:00:07 +00:00
Daniel d2e31c26e9 Added new values to theme.json and added logic for ui
Also fixed normal speed not working and changed "Default" to "Normal" in the enums as it makes more sense.
2019-10-26 09:57:00 +00:00
Daniel 34eb93f565 Fix shadows toggle button 2019-10-26 09:37:20 +00:00
Daniel 471ab7923d Use flexbox to align stuff
I don't know what you would need it for, but the manual position setting in the theme currently only works for the footer, won't be a hassle to do for main though.
2019-10-24 20:22:49 +00:00