Commit Graph

8024 Commits

Author SHA1 Message Date
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
STEPHANVS 7bbc7ab05f
Merge branch 'master' of https://gitlab.com/istvanmate/openlp 2021-06-18 23:45:56 +02:00
Tim Bentley 47e49dd845 Merge branch 'fix-reselected-theme-stream' into 'master'
Fix reselected theme stream

Closes #576

See merge request openlp/openlp!330
2021-06-17 20:56:05 +00:00
robbiejackson 1feeadf3bb review comments applied 2021-05-26 08:56:20 +01:00
robbiejackson 4ff585a774 fixes applied and some associated tests written 2021-05-21 20:38:35 +01:00
robbiejackson 4f08c25b6b several bugs relating to theme stream UI fixed 2021-05-13 10:29:29 +01: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
Daniel Martin b5b510b2ed More fixes 2021-04-25 05:15:37 +00:00
robbie jackson d7fe052afc Confirmation form 2021-04-15 17:33:10 +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
Tomas Groth 8ef650b6cb Update database_exists method. maybe it will support multiple versions. 2021-03-26 21:21:42 +00:00
Tomas Groth cc07ab572c Merge branch 'fix-preview-pause-play' into 'master'
Fix preview video restart after pause or stop

See merge request openlp/openlp!306
2021-03-08 21:16:42 +00:00
robbiejackson 4e88c975ed code changes implemented 2021-03-05 10:19:16 +00:00
robbiejackson 9e0294024b fix preview video restart after pause or stop 2021-02-21 21:17:57 +00:00
robbie jackson febf2615b5 Fix setting custom geometry 2021-02-20 21:32: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 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
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
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 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 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 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
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
Raoul Snyman d18faa5233
Hopefully fix some confusion, fixes #62 2020-09-23 19:20:06 -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
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
Raoul Snyman 58e2e50610
Remove the references to FontAwesome, this file does not contain FontAwesome at all 2020-08-12 21:48:32 -07: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