Commit Graph

3210 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
fa9a3c6f92 Tests plugin 5 2020-03-11 21:53:41 +00:00
Tim Bentley
4ce197ecc2 Tests plugin 4 2020-03-10 16:59:25 +00:00
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
d43811f38d Tests plugin 3 - and Fix #272 2020-03-08 21:45:42 +00:00
Tim Bentley
b51829d4d6 Merge branch 'between-item-transitions' into 'master'
Transitions between items

Closes #191

See merge request openlp/openlp!121
2020-03-05 20:35:25 +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
Tim Bentley
7d532778bd Tests plugin 2 2020-03-05 20:34:08 +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
Daniel
11a68d36ad fix vertical positioning on text slides 2020-03-03 20:25:36 +13:00
71874302d0
Skip a non-macOS test which is failing on macOS 2020-02-23 23:15:56 -07:00
Tim
7fc55e3e40
Fix appvoyer yet another go. 2020-02-22 21:16:40 +00:00
Tim Bentley
f9181665b8 Fix appvoyer tests - we hope
Migrate UI to pytest and fix up all tests.
2020-02-21 07:18:26 +00:00
Tim Bentley
922b65cf18 Fix appvoyer tests - we hope
Migrate UI to pytest and fix up all tests.
2020-02-18 08:08:39 +00:00
Tim Bentley
86af416233 Tests 3 - Finish UI and Widgets 2020-02-15 21:04:17 +00:00
Tim
dae7880604
Migrate lib part 1 2020-02-13 21:04:15 +00:00
Tim
a544aa11ff
Migrate display 2020-02-13 20:57:51 +00:00
Tim
2eb385c774
Migrate core and common 2020-02-13 20:50:39 +00:00
Tim Bentley
170c37d441 Revert "Migrate Media and add Pytest-qt"
This reverts commit 3dcac055be.
2020-02-12 20:28:33 +00:00
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
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
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
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
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
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
Daniel
0d16ce667f ThemeProgressForm show progress 2019-12-19 15:25:05 +00:00
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
f9b298f0dc Skip the main window tests on macOS until we can figure out what the problem is 2019-12-12 05:44:57 +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
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
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
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
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
Ee Savior
c3e6d3f776 Test improvements for bible ref parsing 2019-12-03 19:54:57 +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
Ee Savior
f50b81b9fb Test improvements 2019-11-26 19:32:16 +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
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
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
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
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
a019b42636 Force the display checkbox to be selected for at least 1 screen 2019-11-02 07:05:08 +00:00
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
John Morris
ecaa587e44 Initial release of the test for SplashScreen.py 2019-11-01 15:44:53 +00:00
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
8cc2e3af9d Fix the tests so that the Arch runner goes back to green 2019-10-31 20:40:18 +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
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
2ace207485 Merge branch 'skip-pymupdf-tests-if-not-installed' into 'master'
Do not test PyMuPDF if it's not installed

Closes #288

See merge request openlp/openlp!48
2019-10-24 20:29:35 +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
Simon Hanna
bc51c7ca7f Do not test PyMuPDF if it's not installed
Fixes #288
2019-10-24 19:56:08 +02:00
Daniel
c0aa199ac3 Add background_source to Theme and use it in the theme wizard
The theme wizard (while editing a theme) now changes both background_source and background_filename then sets filename to the new cache location on apply (also added the filename_source var to Theme). The new var is needed so when the user goes to change the theme again, they see the file they selected, not the cached one. This commit fixes the issue of changing theme backgrounds not deleting the cached file but deleting the original file.
2019-10-23 22:54:29 +00:00
1c4224e3d7 Skip certain tests if we're running on GitLab or AppVeyor 2019-10-18 16:54:00 +00:00
99d2ec7715 Create a Theme Preview dialog, plus some theme background fixes.
- Update .gitignore to ignore virtualenvs and eggs directory
- Create a dialog to generate theme previews/thumbnails
- Use theme preview generation dialog all over
- Create a test for the new method
- Update existing theme manager tests
- Skip Bible HTTP tests when in GitLab CI
- Make theme backgrounds scale and centred
2019-10-18 06:12:09 +00:00
1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it 2019-10-10 15:28:16 +00:00
John Kirkland
a129485805 Resolved issue #282 by deleting the get_books function in HTTPBible,
allowing it to use the on in the parent class, BibleImport.
2019-10-09 08:27:28 +00:00
a1a101793d Fix issue #280 where the constructor was not accepting the custom_geometry argument 2019-10-09 08:26:42 +00:00
Tomas Groth
1e8f72d49f LiveWorship importer 2019-10-07 17:12:38 +00:00
Stoivo
6e640fe7a5 Sort the authors when exporting the songs
I export all our songs and store it in git so I know what changes and can revert
if someone change incorrectly.
2019-10-01 20:58:20 +00:00
Mat
c6ed9e6a01 Allow searching by Song Number 2019-09-26 20:49:05 +00:00
Bastian Germann
1a756def20 Replace launchpad references 2019-09-21 13:15:11 +02:00
Bastian Germann
9941aaac16 Replace mention of pylint by flake8 2019-09-21 13:14:23 +02:00
Bastian Germann
95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02:00
Tim Bentley
ab19467c0b Merge branch 'test_fixes' into 'master'
test_fixes

See merge request openlp/openlp!13
2019-09-21 06:22:42 +00:00
Tim Bentley
3e5dfdb730 Add initial cleanup files for media fixes.
Signed-off-by: Tim <tim.bentley@gmail.com>
2019-09-21 04:56:43 +00:00
Benjamin Hoving
3271e15401 Merge remote-tracking branch 'upstream/master' into test_fixes 2019-09-19 20:07:44 -04:00
c1933352ea Ignore some generated files, make generate resources script check for an existing file; ignore pdfcontroller test for now 2019-09-18 18:29:05 +00:00
Benjamin Hoving
e0fc84f218 remove test_bzr_tags 2019-09-17 19:20:15 -04:00
Benjamin Hoving
04a70ac59e remove test_pylint 2019-09-17 19:20:04 -04:00
9d16ae2b06 Based on ic90's code, this just simplifies some of the code, and streamlines how things work, plus a couple of CSS fixes.
bzr-revno: 2904
2019-09-15 17:22:22 +02:00
cb2ccac22c Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well
bzr-revno: 2902
2019-09-14 08:27:40 +01:00
25a7c6f5b3 Skip the Mac LO tests on non-Mac platforms; Make detection work for a missing Pyro4 as well 2019-09-12 23:09:19 -07:00
671abe1def Fix the queued alerts not being displayed 2019-09-12 15:39:57 -07:00
3b87327682 Fix all the tests 2019-09-11 23:06:35 -07:00
83cd5c1a88 HEAD 2019-09-11 21:41:43 -07:00
3af3068027 Fix alerts to scroll properly, and simplify how everything works 2019-09-11 21:41:30 -07:00
John Lines
f2c7bf0367 put default hints plugin directory and chnage name to singingthefaith-hints.tag 2019-09-04 17:06:44 +01:00
John Lines
3c677bc077 Linting fix 2019-09-03 13:42:06 +01:00
John Lines
b2f3496093 add tests with hints subdirectory 2019-09-03 12:53:54 +01:00
John Lines
53bf0fe420 Merge trunk updates 2019-09-03 11:20:46 +01:00
John Lines
6b8352abea fix tests to allow for SongbookNumberInTitle defaulting to false and add hints tests 2019-09-03 10:52:09 +01:00
Tim Bentley
f6713ddf52 Fix linting errors 2019-08-30 13:09:02 +01:00
Tim Bentley
19dfcc15aa Head 2019-08-30 10:32:05 +01:00
Tim Bentley
9e376c1e85 updates 2019-08-30 10:23:12 +01:00
Tomas Groth
842b0c07c7 trunk 2019-08-28 21:50:03 +02:00
Tomas Groth
b999b2a55e Added support for more meta directives. 2019-08-28 21:28:27 +02:00
2557eeeaa6 Changed button to say 'Contribute', moved some text around, removed some unnecessary text 2019-08-22 20:21:15 -07:00
3ce073c4bf Fix image height, update tests, and make 'npm test' only run the tests once instead of continually 2019-08-22 09:40:45 -07:00
John Lines
4cbc4c9d82 Merge trunk updates 2019-08-12 07:34:02 +01:00
Phill
a950a9bcce fixes 2019-08-06 22:33:43 +01:00
Phill
dd4d9b9255 Add a singletom Metaclass 2019-07-20 13:27:28 +01:00
Phill
4f0ee2b0d3 Minor fixes and changes
bzr-revno: 2887
2019-07-19 19:43:14 +01:00
John Lines
2e89ec1f29 enable whole song impoerter test 2019-07-19 12:11:16 +01:00
John Lines
9cdf4faa5b Merge trunk updates 2019-07-19 11:51:25 +01:00
Phill
c1ff239002 Lint fix 2019-07-18 20:26:54 +01:00
Phill
ba99025a5f Fix tests 2019-07-18 20:14:58 +01:00
5121431281 Add Zeroconf services to OpenLP so that external devices can find OpenLP on the network.
bzr-revno: 2885
2019-07-04 12:00:24 -07:00
Phill
9c35b7dcdc Minor fixes, and changes 2019-07-03 14:23:23 +01:00
a8e46110ed Fix an incorrect if and update tests 2019-07-02 23:30:01 -07:00
7c1eb9f24d Update test 2019-07-02 20:53:20 -07:00
11ad9dbb22 Further refactor the code, and fix up the tests 2019-07-02 20:05:01 -07:00
0618f63ede Added a Zeroconf service to aid devices detecting OpenLP on the network 2019-07-01 15:36:14 -07:00
Nico Opiyo
b42034de47 Changed variable names to camelCase and added parameter for Jenkins JS tests 2019-07-01 20:45:08 +03:00
Nico Opiyo
14f53eef89 Pulled in latest changes from trunk 2019-07-01 09:47:38 +03:00
Nico Opiyo
0eff721f24 Fixed unit tests for alerts branch 2019-06-30 22:16:54 +03:00
John Lines
d52d5bb0e2 Fix lint warning in tests and importer.py 2019-06-30 20:13:33 +01:00
john
8f91f0c787 Fix undefined auto_verse_order_ok case, and add some test resources 2019-06-29 15:43:32 +01:00
john
2bfa620ebf Merge trunk updates 2019-06-29 15:04:27 +01:00
john
184462d852 Test fixed for single verse, all verses failing test not run yet 2019-06-29 14:59:03 +01:00
Phill
28da80ecf9 Fix up and improve the Words Of Worship importer
bzr-revno: 2883
2019-06-28 21:15:27 +01:00
Phill
e81a97f582 PEP Fixes 2019-06-28 19:29:39 +01:00
Phill
26e4606ed2 Fix test data 2019-06-28 19:20:11 +01:00
Phill
f79e8803c9 Word of Worship file importer fixes / rework 2019-06-28 19:09:25 +01:00
john
703eb0079b Merge trunk updates 2019-06-27 13:10:34 +01:00
john
8a4c349f9e Tidy up auto verse order generation 2019-06-27 13:01:11 +01:00
john
66712873b4 Singing The Faith Importer - Add the importer, and tests 2019-06-17 09:44:34 +01:00
john
20d0b40f8b Singing The Faith Importer - Initial version 2019-06-17 09:30:45 +01:00
Tim Bentley
7143fbb8d1 Fix streaming part1 2019-06-14 18:54:04 +01:00
Tomas Groth
9bf639a3cb merge trunk 2019-06-11 21:13:35 +02:00
Tomas Groth
7cb8758fdd Fixed test on windows by mocking out render. 2019-06-11 21:12:33 +02:00
596c484bd7 Add presentations through LibreOffice on macOS.
bzr-revno: 2878
2019-06-10 22:01:02 -07:00
Tomas Groth
0c7fe8d97c fix test 2019-06-09 22:06:20 +02:00
Tomas Groth
04d3efef9e fix some broken tests 2019-06-07 23:05:02 +02:00
7819a9eb02 Fix license issues 2019-06-04 21:57:26 -07:00
bae4cb2a44 HEAD 2019-06-04 21:53:18 -07:00
Phill
52eb196e5b PEP8 2019-05-31 21:19:15 +01:00
Phill
cdf29876e2 More media clean-up 2019-05-26 21:53:54 +01:00
Phill
c2550777c3 VLC extension tidyups 2019-05-26 11:30:37 +01:00
Phill
c901ec3d75 Move suffixes from list to set, remove VlcPlayer.is_active as it was never ser 2019-05-24 23:11:11 +01:00
Phill
3476174313 Pep fix 2019-05-23 20:49:13 +01:00
Nico Opiyo
e8edb7e52f Pulled in changes from trunk 2019-05-22 10:28:25 +03:00
Phill
5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
fa7e8f9d3c PJLink 2 Update v07
bzr-revno: 2871
2019-05-20 20:25:33 +01:00
3d18478ac7 Fix up the tests 2019-05-18 08:56:22 -07:00
8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
2069c94a10 Remove extraneous parens 2019-05-15 06:23:58 -07:00
0c14ddf31f PJLink2 Update v07 2019-05-11 02:07:40 -07:00
bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Tim Bentley
9e22ed86e3 remove unneeded test 2019-05-08 14:58:06 +01:00
b4d5425887 PJLink2 Update v06
bzr-revno: 2869
2019-05-07 17:57:35 +01:00
984e79faa9 PJLink2 Update v05
bzr-revno: 2868
2019-05-07 17:57:02 +01:00
Phill
0f640368e1 Just to trigger the tests :-)
bzr-revno: 2867
2019-05-07 17:56:21 +01:00
855828939f PJLink2 update v06 2019-05-04 21:08:32 -07:00
Tim Bentley
a7821bdd26 rename additions to arguments 2019-05-04 20:47:06 +01:00
Tim Bentley
3526c3de64 Head 2019-05-04 20:29:20 +01:00
Phill
5cb0d2a772 test fix 2019-05-04 19:13:57 +01:00
Phill
1d736a58f5 Fix up tests 2019-05-04 13:05:53 +01:00
Phill
7aa7e5c635 Move some changes out of annother branch 2019-05-04 12:49:20 +01:00
a503c61a51 PJLink2 update v05 2019-05-04 03:21:48 -07:00
Phill
15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
2a479a15da pjlink2 update v04 2019-05-03 22:25:07 -07:00
Tim Bentley
feaee351b2 head 2019-05-03 18:26:37 +01:00
Bastian Germann
db9cc8c310 Add PyMuPDF as additional PDF controller and missing mupdf file formats
bzr-revno: 2864
2019-05-02 14:47:05 -07:00
Bastian Germann
3e23de5bbe Make pylint happy 2019-05-02 19:11:55 +02:00
Bastian Germann
605eadb0c2 Add epub, cbz, and fb2 support to pdf controller 2019-05-02 15:45:07 +02:00
Bastian Germann
1c23a1f372 Make PDF tests run for each backend 2019-05-02 15:12:45 +02:00
Bastian Germann
2ed038ee2e Make PyMuPDF mandatory for tests 2019-05-02 12:35:29 +02:00
Tomas Groth
5f63b1297f trunk 2019-05-01 21:22:01 +02:00
Tomas Groth
85879122ab Implement suggestions and fix test. 2019-05-01 21:19:21 +02:00
Tomas Groth
e14dd69817 trunk 2019-04-30 21:02:42 +02:00
Bastian Germann
d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
d6cf6cf6bf PJLink2 update V03 2019-04-28 00:03:51 -07:00
ddd14a5fc2 pjlink2 update v02 2019-04-26 00:39:37 -07:00
Tim Bentley
e607a95b86 Fix tests 2019-04-21 09:53:59 +01:00
5f6887f837 PJLink2 Update V1 2019-04-20 18:04:59 -07:00
Bastian Germann
be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00