Commit Graph

3215 Commits

Author SHA1 Message Date
Raoul Snyman 10f325d1dd
Fix #881 by setting changing the 'replace' argument to be the position of the item to be replaced 2021-09-01 22:35:11 -07:00
Mateus Meyer Jiacomelli 368c1aa69a Better Dark Mode and UI Theme Support 2021-09-01 18:34:06 +00:00
Tomas Groth 54ad7496cd Merge branch 'display-mode-toggle' into 'master'
Display mode toggle

Closes #905

See merge request openlp/openlp!348
2021-08-28 20:36:54 +00:00
Daniel Martin 744e141dbd Display mode toggle 2021-08-28 20:36:53 +00:00
robbie jackson c44d261a0e Fix cd media crash 2021-08-28 07:04:15 +00:00
Raoul Snyman 4d3ade20c7
Add support for folders to plugins
- Make a derivative MediaManagerItem class for generic folder support
- Make add and choose folder dialogs based on image plugin dialogs
- Implement folder and item mixins to get db models "for free"
- Implement database layer for media plugin
- Implement database layer for presentations plugins
- Refactor media plugin to inherit from FolderLibraryItem
- Refactor presentations plugin to inherit from FolderLibraryItem
- Migrate media files from settings to database
- Migrate presentations files from settings to database
- Convert the load icons in the media plugin into a dropdown
- Add new tests for MediaMediaItem.get_list()
- Closes #165
- Closes #223
- Closes #224
- Closes #582
2021-08-25 22:51:43 -07:00
Tim Bentley b5a5cf82c4 Merge branch 'improve-help' into 'master'
Improve help

Closes #777

See merge request openlp/openlp!344
2021-08-25 21:14:19 +00:00
robbie jackson 2907cb4f14 Improve help 2021-08-25 21:14:19 +00:00
István Máté 58800cf4be Webserver mimetype support 2021-08-25 19:28:15 +00:00
Tim Bentley b10fd605b7 Merge branch 'alert-fix' into 'master'
Alert scroll missing text + default font mismatch fix

See merge request openlp/openlp!336
2021-08-19 16:30:49 +00:00
Mateus Meyer Jiacomelli 7d0990021d Alert scroll missing text + default font mismatch fix 2021-08-19 16:30:49 +00:00
Tim Bentley 0e4055664c Merge branch 'issue-711-screen-geometry' into 'master'
Fix logic in get_screen_number to be more fault tolerant

Closes #711

See merge request openlp/openlp!342
2021-08-19 16:29:58 +00:00
Tim Bentley 73bb4690b9 Merge branch 'add-new-service-message' into 'master'
Output message box when a user clicks on New Service when there's already a blank service there.

Closes #777

See merge request openlp/openlp!345
2021-08-19 16:25:02 +00:00
robbie jackson aee5d5b495 Fix main window positioning 2021-08-19 16:23:56 +00:00
robbiejackson cdc1234ebb code and settings test done 2021-08-18 18:59:29 +01:00
Raoul Snyman 322f4f1d5b Fix bug #711 and add some tests 2021-08-06 08:24:44 -07:00
Tim Bentley e048348890 Merge branch 'add-slide-numbers-in-song-footer' into 'master'
Add slide numbers in footers

Closes #847

See merge request openlp/openlp!339
2021-07-22 20:48:16 +00:00
robbie jackson 3bbb46cdd3 Add slide numbers in footers 2021-07-22 20:48:15 +00:00
Scott Western 0eb4e4b99e Use CSS standard gradients 2021-07-21 20:44:41 +00:00
robbie jackson ddcfd34ef3 Test reselected theme stream 2021-07-03 18:30:59 +00:00
Raoul Snyman 88f7a805f8 Merge branch 'fix_tests' into 'master'
Fix tests (broken on newer versions of pytest-qt)

See merge request openlp/openlp!332
2021-06-18 05:19:44 +00:00
Daniel Martin 00d5570d1d Fix tests (broken on newer versions of pytest-qt) 2021-06-18 05:19:44 +00:00
robbiejackson 4ff585a774 fixes applied and some associated tests written 2021-05-21 20:38:35 +01:00
Tomas Groth 0fffbb2f17 Merge branch 'fix-sequential-presentations-2' into 'master'
Fix sequential presentations - proper fix

Closes #700

See merge request openlp/openlp!324
2021-04-28 07:10:27 +00:00
robbie jackson 5793526bcb Fix sequential presentations - proper fix 2021-04-28 07:10:27 +00:00
Raoul Snyman 431c4fe6ee Merge branch 'fix-printicons' into 'master'
Fix Icons in Print when Dark Theme.

See merge request openlp/openlp!325
2021-04-28 06:38:59 +00:00
Tim ee28fad5b4
Fix Icons in Print when Dark Theme.
Fix Test notes following clean up
2021-04-28 07:30:26 +01:00
Raoul Snyman 4d4717a905 Merge branch 'more_media_fixes' into 'master'
More media fixes

Closes #665 and #815

See merge request openlp/openlp!323
2021-04-28 06:19:48 +00:00
Daniel Martin 7cc367801a More media fixes 2021-04-28 06:19:47 +00:00
Tim Bentley b81d7e753c Merge branch 'fix_service_save_failure' into 'master'
Fix service save failure

Closes #816

See merge request openlp/openlp!322
2021-04-25 06:18:50 +00:00
Daniel Martin 0ab55950a8 Fix service save failure 2021-04-25 06:18:50 +00:00
Tim Bentley 8381adfc36 Merge branch 'fix_websocket_crash' into 'master'
Fix websocket crash

Closes #810

See merge request openlp/openlp!315
2021-04-25 06:18:16 +00:00
Daniel Martin d34e39524a Fix websocket crash 2021-04-25 06:18:16 +00:00
Tim Bentley 9039fe04f8 Test Migration and Cleanup - 1 2021-04-24 16:55:38 +00:00
Raoul Snyman 5caca527e1 Merge branch 'confirmation-form' into 'master'
Confirmation form

Closes #675

See merge request openlp/openlp!313
2021-04-15 17:33:10 +00:00
robbie jackson d7fe052afc Confirmation form 2021-04-15 17:33:10 +00:00
Tim Bentley ac6aae9a3a Update Tests - 02 2021-04-15 17:25:59 +00:00
Daniel Martin 99190ebe56 Fix data directory copy fail 2021-04-03 15:56:47 +00:00
Daniel Martin 8ee657bc8f Add api data for bibles
Including version, copyright and permissions for primary and secondary bible.
2021-03-29 20:29:36 +00:00
Tim Bentley ed3608bf47 Merge branch 'fix-impress-display' into 'master'
Fix impress display

Closes #30

See merge request openlp/openlp!309
2021-03-26 22:02:32 +00:00
Tim Bentley a9c3372dfa Merge branch 'fix-ccli-notification' into 'master'
changed CCLI no access notification to be in message area

See merge request openlp/openlp!305
2021-03-10 17:42:17 +00:00
Daniel Martin 7d71b70d62 Fix reset footer template 2021-03-08 21:14:49 +00:00
robbiejackson 845402f8a3 fix lint problem with import pytest 2021-03-05 20:59:23 +00:00
robbiejackson 48f91bcd30 added tests for settings presentation tab 2021-03-05 20:51:02 +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
Daniel Martin a327b70dc5 Fix missing image service load crash 2021-02-06 15:48:08 +00: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 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
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
Daniel Martin 7b8c4a31c9 Prevent empty slides being added
And some comments and grammer
2021-01-03 14:32:00 +00:00
Tim Bentley aade849aca End of 2020 - Just change the Year! 2020-12-30 21:42:49 +00:00
Raoul Snyman 3fb4eee9f3
Yield fixtures are deprecated; the regular fixture does the same job 2020-12-21 21:41:57 -07: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
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 c8e13de8f4 Fix win tests
use posix path when converting to string for comparison
2020-10-10 19:03:10 +13: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
Raoul Snyman 47261d206b
Try to fix some font issues
- Closes #39
2020-10-04 23:22:31 -07: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 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
Tomas Groth 64b62c4f59 Implement support for windows 10 dark mode, fixes #370. 2020-10-02 02:18:39 +00: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 e09aec5d34 test_pdfcontroller: Get rid of platform specifics
As system() called PDF controllers are removed, test_pdfcontroller can be
simplified because PyMuPDF will use the mocked screen.
Get rid of the platform-dependent screen size obtaining which gets rid of
the Xlib dependency.
2020-09-28 21:58:05 +02: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
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 52e9daaf5d
Fix the PDF Controller tests on macOS 2020-09-25 22:06:45 -07:00
Raoul Snyman ed488621aa
Fix problem with new MediaShout test 2020-09-25 21:52:12 -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
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
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
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
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
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 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
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
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
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 2223a56268 Logging and Powerpoint fixes 2020-05-02 18:53:56 +00: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
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 1ffae03a85 Attempt to fix test on windows. 2020-04-11 04:52:06 +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