raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
17,363 Commits 5 Branches 0 Tags 296 MiB
6f1c9ce891
Commit Graph

3209 Commits

Author SHA1 Message Date
Ken Roberts
2dfce1ad32 Issue #985 - TypeErr in PJLink.get_data() fix 2022-02-05 16:02:48 +00:00
Tim Bentley
87159e6e28 Merge branch 'issue-986-song-import' into 'master' 
Fix bug #986 to better handle a both a correctly behaving lxml, as well as a badly behaving lxml

Closes #986

See merge request openlp/openlp!406
 2022-02-05 10:31:38 +00:00
Raoul Snyman
aa22652b3e Merge branch 'issue-559-prevent-user-closing-display-window' into 'master' 
Prevent the user from closing the display window

Closes #559

See merge request openlp/openlp!405
 2022-02-04 22:06:06 +00:00
Raoul Snyman
26d3659250 Prevent the user from closing the display window 2022-02-04 22:06:06 +00:00
Ken Roberts
be21ef15e6
Update tests for pjlinkcommands 2022-02-03 
- (Ongoing) Update strings to f'' format

- New test module projector/messages/test_clss.py
    - projectors/test_projector_commands_01/test_*_clss_* tests moved here
    - Added start_poll test

- New test module projector/messages/test_misc.py
    - Added test_srch

- openlp/core/projectors/plinkcommands.py
    - Updated process_srch log entry in case of no projector instance
 2022-02-04 13:33:25 -08:00
Raoul Snyman
c0e8cef731 Fix bug #986 to better handle a both a correctly behaving lxml, as well as a badly behaving lxml 2022-02-04 11:39:44 -07:00
Raoul Snyman
ae0927d1f4 Expand tests a little further 2022-02-04 10:01:51 -07:00
Tim
4400e0e132
Add some more tests 2022-02-04 15:40:12 +00:00
Raoul Snyman
4f74be7d0a Fix loading service files from the command line 2022-02-04 15:30:43 +00:00
Raoul Snyman
54ad754268 Make two versions of a test to work around a difference in Python 3.10 2022-02-03 11:26:24 -07:00
Raoul Snyman
0f74ef6f67 Handle invalid XML when parsing verses 2022-02-03 15:02:13 +00:00
Tim Bentley
de30cc3996 Merge branch 'issue-937-handle-unknown-verse-types' into 'master' 
Fix issue #937 by handling custom verse types correctly

Closes #937

See merge request openlp/openlp!396
 2022-02-03 07:49:14 +00:00
Raoul Snyman
bb8e508887 Fix issues with searching from the web remote 2022-02-03 05:49:56 +00:00
Raoul Snyman
35723ed72c Fix issue #937 by handling custom verse types correctly 2022-02-02 11:28:46 -07:00
Tim Bentley
04bbbba305 Merge branch 'pjlink_cmd' into 'master' 
Update pjlinkcommands tests

Closes #976 and #978

See merge request openlp/openlp!388
 2022-02-01 16:43:09 +00:00
Ken Roberts
e02b359b7e Update pjlinkcommands tests 2022-02-01 16:43:09 +00:00
Tim Bentley
c9c8c62595 Merge branch 'Chinese-new-year' into 'master' 
Better late than never

See merge request openlp/openlp!391
 2022-02-01 11:11:36 +00:00
Tim
29db2f1fb7
Better late than never 2022-02-01 10:10:57 +00:00
Raoul Snyman
e30fb26a3c Merge branch 'pjm-tests' into 'master' 
Tests for ProjectorManager 2022-01-23

See merge request openlp/openlp!386
 2022-01-31 02:36:14 +00:00
Ken Roberts
2d0855f975 Tests for ProjectorManager 2022-01-23 2022-01-31 02:36:14 +00:00
Raoul Snyman
fa802a5f3b
Stop the display window from minimizing when the OpenLP window is not active on macOS 2022-01-29 16:22:10 -07:00
Tim Bentley
ff0605cb21 Merge branch 'fix-915-songs-background-audio-auto-start' into 'master' 
Restore the auto-play for background audio in songs (fixes #915)

Closes #915

See merge request openlp/openlp!385
 2022-01-24 08:40:29 +00:00
Raoul Snyman
70fa22fdb4 Restore the auto-play for background audio in songs (fixes #915) 2022-01-22 13:21:31 -07:00
Raoul Snyman
91322f87d2 Merge branch '30rc1-fixes2' into 'master' 
Various bug fixes

Closes #978 and #976

See merge request openlp/openlp!384
 2022-01-21 21:32:09 +00:00
Tomas Groth
1d0b578370 Various bug fixes 2022-01-21 21:32:09 +00:00
Raoul Snyman
b3c27986c7 Merge branch 'proj_manager_tests' into 'master' 
ProjectorManager tests upd_add_port listener

See merge request openlp/openlp!383
 2022-01-21 21:30:52 +00:00
Ken Roberts
caa78be00d ProjectorManager tests upd_add_port listener 2022-01-21 21:30:51 +00:00
Tomas Groth
bfce3db902 A few bug fixes 2022-01-21 07:49:55 +00:00
Ken Roberts
c0713a56d4 ProjectorManager tests 2022-01-20 21:22:41 +00:00
Daniel Martin
fce6b47127 Fix a few service bugs 2022-01-16 13:15:09 +00:00
Tim Bentley
c6be2ac31d Merge branch 'clean-up-alerts-plugin' into 'master' 
clean up alertsmanager

See merge request openlp/openlp!369
 2021-11-07 07:43:20 +00:00
Raoul Snyman
e4036ea14f Merge branch 'fix-song-flash-840' into 'master' 
Fix song flash

Closes #840

See merge request openlp/openlp!367
 2021-11-07 00:52:53 +00:00
robbie jackson
aff97c0e27 Fix song flash 2021-11-07 00:52:53 +00:00
Andreas P
ddcc7dbd4f clean up alertsmanager 
- the alertsmanager does not manage the alerts anymore, they are managed by the display
- thus the list of alerts is not needed, the id is not needed, also the
  timer id is not needed
- live_display_active is not needed anymore
- there is no point in using the status message
 2021-10-23 15:29:33 +02:00
Andreas P
a252032426 rename readme in test folder and fix text about dependencies 2021-10-23 15:09:51 +02:00
Raoul Snyman
fca5052b24
Fix loading the previous service as a str instead of a Path 
- Fixes #839
- Wrote a whole bunch of tests
 2021-09-16 16:59:03 -07:00
Tim Bentley
191e8dc672 Merge branch 'fix-dvd-media-crash' into 'master' 
Fix dvd media crash

Closes #876

See merge request openlp/openlp!356
 2021-09-12 08:28:58 +00:00
robbie jackson
2eef92fe4a Fix dvd media crash 2021-09-12 08:28:58 +00:00
Tim Bentley
df0163b144 Merge branch 'fix-show-presentation-after-media' into 'master' 
Fix of problem showing presentations after media items

Closes #833

See merge request openlp/openlp!362
 2021-09-12 08:28:37 +00:00
robbiejackson
fee77506f6 code fix done and tests updated 2021-09-10 21:10:49 +01:00
Raoul Snyman
b37fd8faca Fix #896 and write tests for the form 2021-09-07 22:00:11 -07:00
Tomas Groth
e584c5bf49 Skip test that fails on macOS. 2021-09-02 20:43:42 +00:00
Tim Bentley
a3ff2b1d0b Merge branch 'fix-songbook-merge' into 'master' 
Fix merging of song books

Closes #899

See merge request openlp/openlp!347
 2021-09-02 06:46:10 +00:00
robbie jackson
80a70d5b63 Fix merging of song books 2021-09-02 06:46:09 +00:00
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