Commit Graph

12639 Commits

Author SHA1 Message Date
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
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
Raoul Snyman 5b7e628403 Run the Display JS tests as well
- Add an entry in .gitlab-ci.yml
- Create a custom browser that'll run in Docker with Chromium Headless
- Add JS linting
- Fix up issues highlighted by linter
2019-10-23 20:09:37 +00:00
John Morris 212d4c8678 Updated label for Copy and Custom Footer Text 2019-10-21 20:05:35 -04:00
Raoul Snyman 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
Raoul Snyman 1e76868a23 Remove vim lines from files and add a .editorconfig for editors that support it 2019-10-10 15:28:16 +00:00
Raoul Snyman ff1b2dab63 Publish the coverage report, plus bug fixes.
- Default theme level to Global, as per #48
- Make song delete message make more sense, fixes #64
- Publish the coverate report to OpenLP's GitLab page
2019-10-10 15:26:56 +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
Raoul Snyman 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
Simon Hanna 7332716191 Fix typo 2019-09-23 22:31:45 +02:00
Tomas Groth a7b2e4143f Merge branch 'bzr2git' into 'master'
Remove some bzr and pylint occurences

See merge request openlp/openlp!11
2019-09-21 14:13:48 +00:00
Andreas P f576b93774 Revert "Fix: add missing resources.py"
This reverts commit 9aa7206489.
2019-09-21 14:03:19 +00:00
Bastian Germann 95a056e504 Remove some pylint occurences 2019-09-21 13:14:23 +02: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 1da59bef0d Create a linting stage 2019-09-18 16:44:39 +00:00
Raoul Snyman 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
Tomas Groth c2273d8d96 Forgot to update to latest CSS when updating RevealJS to 3.8.0. 2019-09-15 14:44:01 +02:00
Raoul Snyman 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
john+ubuntu@paladyn.org a77bb78e6e Add Importer SingingTheFaith
bzr-revno: 2901
2019-09-14 08:26:59 +01:00
Raoul Snyman 8983324ed5 Remove some old, commented out code. 2019-09-13 14:34:18 -07:00
Raoul Snyman 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
Raoul Snyman ccc9b2a7c1 Fix a linting issue 2019-09-12 15:54:09 -07:00
Raoul Snyman 671abe1def Fix the queued alerts not being displayed 2019-09-12 15:39:57 -07:00
raoul@snyman.info 4f9a1b4e0b Minor cosmetic fixes to remove the "<2>" from the app title in KDE:
- Name the display window "Display Window"
- Name the threads dialog "Please Wait"
- Also fix potential issue where threads remove themselves from the dictionary at shutdown and cause an error.

bzr-revno: 2900
2019-09-12 17:04:39 +01:00
Raoul Snyman 3b87327682 Fix all the tests 2019-09-11 23:06:35 -07:00
Raoul Snyman 83cd5c1a88 HEAD 2019-09-11 21:41:43 -07:00
Raoul Snyman 3af3068027 Fix alerts to scroll properly, and simplify how everything works 2019-09-11 21:41:30 -07:00
Bastian Germann 22ae2d66b5 Use start script __main__.py which enables 'python -m openlp'
bzr-revno: 2899
2019-09-11 21:08:27 -07:00
Raoul Snyman 2a8bf17c90 Fix window titles so that the main window just says 'OpenLP' 2019-09-10 14:37:12 -07:00
Raoul Snyman c7965337ba Make a copy of the thread names so that if one disappears while we're waiting, we don't cause an error 2019-09-10 13:34:03 -07:00
Bastian Germann edbf816e79 Drop shebang from __main__ 2019-09-07 00:25:26 +02:00
Raoul Snyman 9c078cce04 Apply Tomas patch 2019-09-05 21:31:51 -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 53bf0fe420 Merge trunk updates 2019-09-03 11:20:46 +01:00
Tim Bentley 265dc0ded9 Undo an incorrect change and replace missing code as pert of the display revamp.
bzr-revno: 2898
2019-08-30 22:32:26 +01:00
Raoul Snyman 7eb41ae49b Fix chord printing properly 2019-08-30 07:43:22 -07:00
Tim Bentley a721250abd finish fixing the theme regeneration 2019-08-30 12:28:10 +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
Raoul Snyman ad813bdbee Chords are now being rendered when printing, but the output needs some work 2019-08-29 22:56:48 -07:00
Raoul Snyman eed89c4024 Remove chords from the slide controller and the display 2019-08-29 14:08:37 -07:00
Tomas Groth c34372c5a2 Added artist as a supported directive. 2019-08-29 20:50:43 +02: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
Raoul Snyman 7eaabb882e Change MySQL-Connector optional dependency to pymysql, a pure-Python MySQL client.
bzr-revno: 2895
2019-08-27 21:18:55 -07:00
Raoul Snyman 54ad6ed69f Correct Python license initials 2019-08-27 07:44:52 -07:00
Raoul Snyman 9ad3975f00 Correct Python license initials 2019-08-27 07:43:51 -07:00
Raoul Snyman 2fdcdaca33 Add license of each project behind name 2019-08-27 07:40:26 -07:00
Raoul Snyman e53f61b7f3 HEAD 2019-08-26 21:41:56 -07:00
Tomas Groth d3a053c0da Add support for new tags in ChordPro: composer, lyricist and meta. 2019-08-26 22:07:33 +02:00
Tim Bentley ff4dc581b4 fix setiing theme data 2019-08-25 12:37:34 +01:00
Tim Bentley db245b3b99 fix up missing translation and Save buttons 2019-08-25 09:20:38 +01:00
John Lines f2513c8474 Implement SongbookNumberInTitle hint 2019-08-23 17:29:39 +01:00
John Lines e42d3431bb Use .format in importer.py 2019-08-23 10:33:48 +01:00
Raoul Snyman 2557eeeaa6 Changed button to say 'Contribute', moved some text around, removed some unnecessary text 2019-08-22 20:21:15 -07:00
Raoul Snyman e2abca9a03 HEAD 2019-08-22 14:39:05 -07:00
Raoul Snyman 9f83e8cfc2 Update the about dialog 2019-08-22 12:55:59 -07:00
Raoul Snyman 81ed036002 Fix a bug where tall images were getting cut off at the top and bottom
bzr-revno: 2892
2019-08-22 11:48:33 -07:00
Raoul Snyman 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
Tim Bentley edf31caa61 Update Translation process and Translations 18082019.
bzr-revno: 2891
2019-08-22 16:48:40 +01:00
Tomas Groth aae8b5b811 Fix test 2019-08-21 21:45:05 +02:00
Tomas Groth 62ca28cf09 Improve image scaling on display 2019-08-21 21:13:27 +02:00
Tomas Groth cd25766b79 Try to get image-scaling working correctly 2019-08-19 22:42:36 +02:00
Tim Bentley df7ffc918a Translations 18082019 2019-08-18 10:15:51 +01:00
Tim Bentley d352d9bc41 Update the translation process files and fix issues 2019-08-17 12:08:17 +01:00
John Lines 4cbc4c9d82 Merge trunk updates 2019-08-12 07:34:02 +01:00
Phill b6512adf2a Fixes 2019-08-06 22:46:00 +01:00
Phill a950a9bcce fixes 2019-08-06 22:33:43 +01:00
Phill 5c2b70ff07 HEAD 2019-08-06 21:46:41 +01:00
Phill 197bd42c9d Fix for invalid song beamer files 2019-08-05 20:43:18 +01:00
Tim Bentley 493f33b764 minor fix 2019-08-04 16:56:07 +01:00
Tim Bentley 0e96c55c8e pep 8 2019-08-04 15:06:00 +01:00
Tim Bentley 24ab4f2cb1 minor fixes 2019-08-04 14:13:33 +01:00
Tim Bentley a8af8a8d18 fix custom copy 2019-08-04 08:53:56 +01:00
Raoul Snyman 38a6f1b2ca Use PyMySQL rather than MySQL Connector 2019-08-03 11:19:25 -07:00
Tim Bentley df2ace541e fix missing state code 2019-07-31 22:01:22 +01:00
Phill 6b9e36e7af Make button action clearer
Fixes: https://launchpad.net/bugs/1673113
2019-07-31 21:12:11 +01:00
Tim Bentley 8ce94115c9 Fix service Print code 2019-07-31 17:26:25 +01:00
Phill 5fb9eb70af Fix deleting song books
Fixes: https://launchpad.net/bugs/1600510
2019-07-30 20:52:10 +01:00
Phill 603a6ff7d6 Fix bible reference search when text matches multiple books
Fixes: https://launchpad.net/bugs/1799005
2019-07-29 21:13:41 +01:00
John Lines 530976cf74 Fix typo 2019-07-28 22:16:02 +01:00
John Lines 8a6e6f767f Make Based on Psalm an automatic comment, do not automatically make Authors type Word 2019-07-28 21:59:51 +01:00
Tim Bentley 7f5166f3d0 Text fixes 2019-07-28 16:56:28 +01:00
Tim Bentley da75c96d03 allow last service to load on startup 2019-07-28 15:40:07 +01:00
John Lines c3eecd04d9 Implement BoldLine hint 2019-07-28 09:46:38 +01:00
Tim Bentley 095881cb90 Update logging settings 2019-07-28 09:40:38 +01:00
Tim Bentley aa5e33da7d Fix settings screen conversion 2019-07-28 09:30:24 +01:00
Phill 2e8da5a79e Fix check box alignment
Fixes: https://launchpad.net/bugs/1832942
2019-07-27 11:01:59 +01:00
John Lines f15cc88eb9 Strip unwanted formatting characters 2019-07-27 09:03:26 +01:00
Phill bbb2fa935c Few performance changes and fixes to prevent possible bugs 2019-07-27 07:37:16 +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 9cdf4faa5b Merge trunk updates 2019-07-19 11:51:25 +01:00
John Lines bd61ad1f6d Add BlankLine hint and deal with a leading asterisk on a verse number 2019-07-17 10:54:03 +01:00
John Lines 72747c3936 Add AddSpaceAfterColon hint 2019-07-16 12:40:23 +01:00
Raoul Snyman ef3aeb6894 Package the VLC plugins too.
bzr-revno: 2886
2019-07-16 13:21:41 +02:00
John Lines a9d0e0909f Update GPL version, use constructor, add comment to signal unepected verse order 2019-07-15 17:25:43 +01:00
John Lines 0c1eb50312 New hints for AddSpaceAfterSemi and CCLI 2019-07-13 13:17:06 +01:00
John Lines 36b5528d43 New style string formatting, restructure indent=0 cases 2019-07-12 15:36:14 +01:00
John Lines 515abee3ae Convert double to single quotes, make hint variable names consistent 2019-07-12 12:26:12 +01:00
John Lines bc70eea7b9 Minimize differences needed to run under OpenLP 2.4.6 2019-07-12 11:49:00 +01:00
Raoul Snyman 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
Raoul Snyman 642d59d7a8 Change VLC paths and include VLC plugins 2019-07-03 23:47:14 -07:00
Phill 9c35b7dcdc Minor fixes, and changes 2019-07-03 14:23:23 +01:00
Raoul Snyman a8e46110ed Fix an incorrect if and update tests 2019-07-02 23:30:01 -07:00
Raoul Snyman 11ad9dbb22 Further refactor the code, and fix up the tests 2019-07-02 20:05:01 -07:00
Raoul Snyman f27e4f8821 Extract filtering to make things more testable 2019-07-02 16:00:27 -07:00
Raoul Snyman 50fcc9b5d5 Add zeroconf to AppVeyor and setup.py, broadcast on all valid interfaces, quit the thread properly 2019-07-02 13:29:42 -07:00
Raoul Snyman 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
Raoul Snyman 61b85f15bc Fix a bug when cleaning up thumbnails where all presentation controllers, whether enabled or not, would be cycled through. 2019-06-30 16:28:38 -07: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 Lines e566a6788c Fix flake8 warnings, print statements, inline comments 2019-06-30 19:03:38 +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