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

12661 Commits

Author SHA1 Message Date
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
john
5f2e2b72d7 Use path objects and remove redundant brackets 2019-06-29 12:12:46 +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
8565db715f Moar minor changes 2019-06-28 20:26:46 +01:00
Phill
e81a97f582 PEP Fixes 2019-06-28 19:29:39 +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
Nico Opiyo
2076851555 Fixed scrolling bug display 2019-06-27 13:11:56 +03:00
Johnthan
dcabe95ac0 fix 1832874 and 1833876 
bzr-revno: 2882
 2019-06-25 19:33:47 +01:00
Phill
a432a57452 rename param js_use to is_js 2019-06-21 23:09:36 +01:00
Phill
3e2e272776 revert suffix stuff 2019-06-21 22:09:28 +01:00
Phill
5b571c4f74 Fixes for path issues 2019-06-21 21:53:42 +01:00
Johnmfl
865ac820d3 added space to Fix Lint errors 2019-06-19 16:52:50 -04:00
Johnmfl
64b7a1347b Fixed Lint errors 2019-06-19 16:31:46 -04:00
Johnmfl
beb3861ae7 Fix #1832874 and #1832876 del temp song files add info to dup song delete form 2019-06-18 20:28:09 -04: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
7c7dbacb03 colon 2019-06-14 20:28:08 +01:00
Tim Bentley
688965081e Fix streaming part1 2019-06-14 20:20:29 +01:00
Tim Bentley
7143fbb8d1 Fix streaming part1 2019-06-14 18:54:04 +01:00
Tim Bentley
2b4842b20d streaming works 2019-06-12 19:04:47 +01:00
Tim Bentley
e68af29694 Head 2019-06-11 20:49:13 +01:00
Tim Bentley
08891d8731 updates 2019-06-11 20:48:34 +01:00
Tomas Groth
9bf639a3cb merge trunk 2019-06-11 21:13:35 +02:00
Tomas Groth
9966d8ace7 Missed a rename of _write_theme to save_theme. 2019-06-11 21:11:54 +02:00
Tim Bentley
edce402a60 fix up media for breakages 2019-06-11 19:40:20 +01:00
Raoul Snyman
596c484bd7 Add presentations through LibreOffice on macOS. 
bzr-revno: 2878
 2019-06-10 22:01:02 -07:00
Tomas Groth
4f705a649a Loading VLC module can also result in an OSError 2019-06-10 22:44:24 +02:00
Tomas Groth
4361159434 Set the default value of core/display_on_monitor to False to avoid blocking the screen with the display window on first start. 2019-06-10 22:22:22 +02:00
Tomas Groth
4c1f67f84b Set song import/export default directory to None 2019-06-10 22:10:38 +02:00
Tomas Groth
31f6779d3f fix pep8 2019-06-09 22:22:43 +02:00
Bastian Germann
81e90c9047 Merge trunk 2019-06-09 18:16:24 +02:00
Tomas Groth
04d3efef9e fix some broken tests 2019-06-07 23:05:02 +02:00
Tomas Groth
ad9d1df172 pep8 2019-06-07 22:51:19 +02:00
Tomas Groth
4074d110ff some path/str fixes 2019-06-07 22:46:51 +02:00
Tomas Groth
3861d340a3 trunk 2019-06-07 22:25:30 +02:00
Tomas Groth
f27fded597 Fix line calculation for the theme preview. Try to make VLC loading more robust. 2019-06-06 22:10:39 +02:00
Raoul Snyman
7819a9eb02 Fix license issues 2019-06-04 21:57:26 -07:00
Raoul Snyman
bae4cb2a44 HEAD 2019-06-04 21:53:18 -07:00
Tomas Groth
1d176515d0 merge trunk 2019-06-04 22:03:54 +02:00
Tomas Groth
3963923e2d Fix as suggested 2019-06-04 22:03:19 +02:00
Tomas Groth
8b489de954 Generate a real footer 2019-06-03 22:11:19 +02:00
Phill
aaaab9bf43 Add media extensions in the service manager 2019-06-01 07:59:45 +01:00
Phill
52eb196e5b PEP8 2019-05-31 21:19:15 +01:00
Phill
8fe469aca3 Re-add period 2019-05-31 21:04:51 +01:00
Phill
f4111e4431 Fix up filters 2019-05-31 20:59:38 +01:00
Tomas Groth
efdae7ab6f trunk 2019-05-29 21:22:52 +02:00
Tomas Groth
2efaffec7a pep8 2019-05-29 21:22:12 +02:00
Tomas Groth
949231a35f Fix traceback on Mac tests 2019-05-29 21:18:25 +02:00
Tomas Groth
7558fb6e64 Use a live webengine widget when previwing themes. 2019-05-28 22:37:50 +02: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
Tomas Groth
38a310a1aa Remove unused code 2019-05-25 21:21:19 +02: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
Tomas Groth
6e03382f1f Reenable setting slidecontroller index when openlp is not in focus. 2019-05-24 21:21:19 +02:00
Raoul Snyman
6800490995 For now, this is a bit of a work-in-progress. This code should pick up the bundled libvlc.(dll|so|dylib) and use it. VLC detection seems to be a little iffy right now. 
bzr-revno: 2873
 2019-05-24 20:50:51 +02:00
Tomas Groth
e6baed1105 pep8 fixes 2019-05-23 22:30:46 +02:00
Tomas Groth
a3fdaff2c4 Fix test and remove debug prints 2019-05-23 21:41:00 +02:00
Phill
dd0d531be3 Fix images 2019-05-23 20:33:46 +01:00
Phill
d178b7adba Tidy ups + doc 2019-05-22 21:46:51 +01:00
Raoul Snyman
ebc6e69668 Fix linting and remove duplicated VLC path env var 2019-05-22 09:59:58 -07:00
Raoul Snyman
ca5e46eb49 HEAD 2019-05-22 09:47:20 -07: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
Tomas Groth
3d8d573389 Always make sure the powerpoint slide index map is created 2019-05-21 22:07:25 +02:00
Tomas Groth
89ecdf2a96 try to make impress support going before start 2019-05-20 22:35:48 +02:00
Tomas Groth
1d71cb83ba merge trunk 2019-05-20 21:56:29 +02:00
Ken Roberts
fa7e8f9d3c PJLink 2 Update v07 
bzr-revno: 2871
 2019-05-20 20:25:33 +01:00
Raoul Snyman
3d18478ac7 Fix up the tests 2019-05-18 08:56:22 -07:00
Raoul Snyman
f74e0c7dc8 Revert some changes from the HEAD merge; Add the lib directory to sys.path for running tests 2019-05-17 23:04:20 -07:00
Raoul Snyman
dad969bc0e Fix some small issues from the move to a new ScreenList object 2019-05-17 22:21:38 -07:00
Raoul Snyman
482b80aa82 Print out the location of the log file 2019-05-17 22:10:51 -07:00
Raoul Snyman
8029a8b767 HEAD 2019-05-17 21:56:15 -07:00
Ken Roberts
0c14ddf31f PJLink2 Update v07 2019-05-11 02:07:40 -07:00
Raoul Snyman
bb6b2b32b9 HEAD 2019-05-10 10:08:32 -07:00
Bastian Germann
ddef29599f Use start script __main__.py which enables 'python -m openlp' 2019-05-09 00:06:09 +02:00
Tim Bentley
e2acc386b7 remove commented out code 2019-05-08 15:09:54 +01:00
Tim Bentley
9e22ed86e3 remove unneeded test 2019-05-08 14:58:06 +01:00
Tim Bentley
7ed4581a3f head 2019-05-07 18:04:52 +01:00
Ken Roberts
b4d5425887 PJLink2 Update v06 
bzr-revno: 2869
 2019-05-07 17:57:35 +01:00
Ken Roberts
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
Raoul Snyman
d6227ea582 HEAD 2019-05-06 22:07:18 -07:00
Raoul Snyman
236bc73e59 Fix an issue with changing the data folder; Include QDarkStyle when building Windows installer 2019-05-06 22:06:29 -07:00
Tomas Groth
8f48fa26e9 head 2019-05-05 20:41:17 +02:00
Tim Bentley
54aea66a16 initial version 2019-05-05 09:13:10 +01:00
Tim Bentley
22db084375 fix missing vlc 2019-05-05 06:59:29 +01:00
Ken Roberts
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
3ee9df96ae PEP8 2019-05-04 19:25:59 +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
Ken Roberts
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
Ken Roberts
2a479a15da pjlink2 update v04 2019-05-03 22:25:07 -07:00
Tim Bentley
feaee351b2 head 2019-05-03 18:26:37 +01:00
Tim Bentley
50e2c6e5e9 updates 2019-05-03 18:25:27 +01:00
Raoul Snyman
d95b4343b5 Temporary workaround for VLC 2019-05-02 20:23:23 -07:00
Raoul Snyman
d42a7118c0 HEAD 2019-05-02 20:20:05 -07: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
Raoul Snyman
46bb693d18 Fix command line args 2019-05-02 11:59:09 -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
2ee21a77c4 Use PyMuPDF over executables if not explicitly set 2019-05-02 11:19:23 +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
Bastian Germann
a3ef19dbd9 Make pylint happy 2019-05-01 11:00:53 +02:00
Bastian Germann
a610133919 Introduce PyMuPDF as additional PDF controller 2019-05-01 10:39:01 +02:00
Tomas Groth
b3c1996e4f Handle absolute and relative paths. 2019-04-30 21:43:41 +02:00
Tomas Groth
e14dd69817 trunk 2019-04-30 21:02:42 +02:00
Bastian Germann
b4e24f10d6 Update new file to GPLv3+ 2019-04-28 21:22:52 +02:00
Bastian Germann
d74e5203c3 Merge HEAD 2019-04-28 21:21:23 +02:00
Ken Roberts
d6cf6cf6bf PJLink2 update V03 2019-04-28 00:03:51 -07:00
Tim Bentley
56722b2729 updates 2019-04-27 16:12:24 +01:00
Tim Bentley
656c1d3bfc fix pep8 2019-04-21 13:48:23 +01:00
Tim Bentley
607d678780 seek slider works 2019-04-21 09:20:43 +01:00
Tim Bentley
f5a2a58234 head 2019-04-21 07:27:05 +01:00
Tim Bentley
0088fd4fe2 fix image theme editing 2019-04-21 07:25:46 +01:00
Ken Roberts
5f6887f837 PJLink2 Update V1 2019-04-20 18:04:59 -07:00
Tim Bentley
468df46c9c More fixes and corrections 2019-04-20 21:29:12 +01:00
Bastian Germann
be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Tomas Groth
f669b8cd7e Followup fix... 2019-04-13 10:24:15 +02:00
Raoul Snyman
84fc07d15d HEAD 2019-04-12 22:10:23 -07:00
Tim Bentley
f1bf3c3000 Finish experimental and start media tab 2019-04-12 22:03:23 +01:00
Tomas Groth
41d876be52 Fix errors detected by pylint. 2019-04-12 21:16:00 +02:00
Raoul Snyman
5786a3f5ac Use the full path to the dll/dylib 2019-04-11 22:52:06 -07:00
Raoul Snyman
453191f395 Move the VLC setup to after the logging is set up 2019-04-11 20:57:15 -07:00
Raoul Snyman
8f4e7dc7db debugging 2019-04-11 20:55:45 -07:00
Raoul Snyman
a16853e2d7 Debugging when not frozen too 2019-04-11 20:51:44 -07:00
Raoul Snyman
cec6f13506 Log VLC path for debugging 2019-04-11 20:24:47 -07:00
Raoul Snyman
f1f313ed5f Detect if OpenLP is running as a frozen app, and set the VLC environment variable 2019-04-11 14:55:57 -07:00
Tim Bentley
49384aa672 head 2019-04-09 19:35:10 +01:00
Tim Bentley
3fd074f5c2 pep8 2019-04-09 18:32:10 +01:00
Tim Bentley
0e57b10263 add experimental flag 2019-04-09 18:21:35 +01:00
Tim Bentley
737d320b3d handle missing live display preserve prview 2019-04-09 17:47:23 +01:00
Tomas Groth
ac0c27a7f4 Update Reveal.js to 3.8.0. 
bzr-revno: 2855
 2019-04-08 23:09:34 -07:00
Samuel Mehrbrodt
c038476b80 Fix songstab 2019-04-08 23:06:05 +02:00
Samuel Mehrbrodt
68ebb22d17 Merge trunk 2019-04-08 23:03:57 +02:00
Tomas Groth
2d83738405 Upgrade to Reveal.js 3.8.0 2019-04-08 21:47:05 +02:00
Tim Bentley
6bea242ae4 Fixes and handle missing display 2019-04-08 18:19:18 +01:00
Nico Opiyo
628cfbf213 Fixed alert positioning with CSS flexbox and also fixed non-scrolling alert display 2019-04-05 17:29:27 +03:00
Tomas Groth
52bdb8db02 Added support for disabling Impress Presentation Screen. Fixes bug 1798651 
Fixes: https://launchpad.net/bugs/1798651
 2019-04-02 22:22:05 +02:00
Nico Opiyo
e56971fa81 Fixed queue bug when showing alerts from the queue 2019-04-02 22:08:27 +03:00
Nico Opiyo
0e1989f06f Fixed all tests and changed entrance transition to class based toggling 2019-03-29 17:18:54 +03:00
Nico Opiyo
c25f4d8197 Cleaned up Javascript and refactored the functions and tests plus optimized animation of text 2019-03-29 15:36:32 +03:00
Phill
98f7c28d65 Add proxy settings to ftw. Option to skip sample data 
bzr-revno: 2853
 2019-03-28 22:03:32 +01:00
Samuel Mehrbrodt
720d79e46a Fix songbook as first slide display 
bzr-revno: 2851
 2019-03-28 21:19:15 +01:00
Tomas Groth
2ebccbfb91 trunk 2019-03-27 21:33:21 +01:00
Tomas Groth
4e739a3ed9 Disable the presentation console 2019-03-27 21:29:19 +01:00
Tim Bentley
0a2de8e606 fix pep8.5 2019-03-27 19:21:11 +00:00
Tim Bentley
ae2109e509 fix pep8.5 2019-03-27 18:59:03 +00:00
Tim Bentley
b7bb59a837 vlc tests pass 2019-03-27 17:46:12 +00:00
Tim Bentley
6cb16a9f0a media now works and plays 2019-03-25 21:45:19 +00:00
Tim Bentley
f849b0eeb0 head 2019-03-25 21:24:51 +00:00
Tim Bentley
112fac8baf Media is now playing again - just 2019-03-24 07:53:19 +00:00
Philip Ridout
8789073eb3 Linting changes 2019-03-17 20:35:11 +00:00
Nico Opiyo
fe6130a534 Fixed buggy alerts and refactored CSS 2019-03-17 22:05:31 +03:00
Philip Ridout
573f31fd45 Minor tidy ups 2019-03-17 10:36:12 +00:00
Philip Ridout
eb115a0ad4 More pathlib clean ups 2019-03-17 10:01:52 +00:00
Philip Ridout
7c284ad520 Fix deleting bibles 
Fixes: https://launchpad.net/bugs/1748719
 2019-03-16 21:07:44 +00:00
Philip Ridout
cae0c2eb09 Revert commented code 2019-03-16 10:58:59 +00:00
Philip Ridout
d8644648a4 Fit the logo to the Main Display 
Fixes: https://launchpad.net/bugs/1819763
 2019-03-16 10:26:05 +00:00
Philip Ridout
296adb59a0 Bible import issues 2019-03-16 10:20:46 +00:00
Philip Ridout
e1d2c67f33 HEAD? 2019-03-15 20:56:32 +00:00
Philip Ridout
056b902cf9 PEP8 2019-03-15 20:47:47 +00:00
Nico Opiyo
7a1c82096d Fixed tests and refactored event listeners for effective testing 2019-03-15 17:46:26 +03:00
Nico Opiyo
53d8b239ff Added scrolling option to alerts 2019-03-12 22:37:07 +03:00
Philip Ridout
50598e9058 pathlib cleanups 2019-03-10 21:01:39 +00:00
Philip Ridout
07a61c57e6 HEAD 2019-03-09 06:59:19 +00:00
Philip Ridout
87216707d3 Test fixes 2019-03-09 06:58:52 +00:00
Ken Roberts
eb8864f569 Minor cleanups 2019-03-08 19:53:20 -08:00
Philip Ridout
11aa69c9ac PEP fixes 2019-03-08 21:25:16 +00:00
Philip Ridout
fc8255d658 PEP fixes 2019-03-08 21:00:16 +00:00
Ken Roberts
cc4b8e4242 PJLink2 Update U 2019-03-08 07:19:57 -08:00
Tomas Groth
07ebc22fa7 Update the appveyor build script. Fix various bugs that caused the frozen app from working. 
bzr-revno: 2848
 2019-03-07 21:51:00 +01:00
Nico Opiyo
de1790ac76 Fixed exit transition bug 2019-03-07 23:20:57 +03:00
Tomas Groth
b6a36f2324 pep8 fixes 2019-03-07 20:23:04 +01:00