712bc5f54f
Add VLC path to PATH environment variable
2019-12-21 22:03:17 +00:00
Tim
7a71d8aa33
Merge branch 'master' of gitlab.com:openlp/openlp
2019-12-21 14:16:18 +00:00
Tomas Groth
d70064614d
Merge branch 'fix-appveyor-hhw' into 'master'
...
Install HTML Help Workshop via Chocolatey
See merge request openlp/openlp!106
2019-12-19 19:18:36 +00:00
cd6d28b38e
Install HTML Help Workshop via Chocolatey
2019-12-19 19:18:36 +00:00
f4b2f5cc7e
Merge branch 'fix-themeprogressform-progress-bar' into 'master'
...
ThemeProgressForm show progress
Closes #346
See merge request openlp/openlp!105
2019-12-19 15:25:05 +00:00
Daniel
0d16ce667f
ThemeProgressForm show progress
2019-12-19 15:25:05 +00:00
37b631b187
Merge branch 'fix-appveyor-release' into 'master'
...
Fix the release build in AppVeyor
See merge request openlp/openlp!104
2019-12-19 15:24:29 +00:00
320407fd07
Fix the release build in AppVeyor
2019-12-19 15:24:29 +00:00
270bd3130d
Merge branch 'translations-18122019' into 'master'
...
Translations 18122019
See merge request openlp/openlp!103
2019-12-18 17:52:37 +00:00
Tim Bentley
bc48bb20ec
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-18 17:52:37 +00:00
Tim
49f30e497c
Merge branch 'master' of gitlab.com:openlp/openlp
2019-12-18 17:13:10 +00:00
Tim Bentley
68bf82770f
Merge branch 'fix-theme-progress-exception' into 'master'
...
Fix exception thrown due to a form not existing yet
See merge request openlp/openlp!102
2019-12-18 16:18:29 +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
d760134a0d
Merge branch 'settings_4' into 'master'
...
Settings 4
Fix breakage in editing songs
Move the settings enums to a common location.
Fix broken tests.
See merge request openlp/openlp!101
2019-12-16 03:37:54 +00: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
Tim
691b119afb
Merge branch 'master' of gitlab.com:openlp/openlp
2019-12-14 17:03:12 +00:00
Tomas Groth
756672732b
Merge branch 'change-transition-direction' into 'master'
...
Change transition direction
Closes #317 and #319
See merge request openlp/openlp!80
2019-12-14 11:44:46 +00:00
Daniel
11dcf5b9ad
Change transition direction
2019-12-14 11:44:42 +00:00
58d61eb1da
Merge branch 'skip-main-window-tests' into 'master'
...
Skip the main window tests on macOS until we can figure out what the problem is
See merge request openlp/openlp!100
2019-12-12 05:44:57 +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
3b4c9985f2
Merge branch 'fix-renderpy-out-of-range-error' into 'master'
...
Fix renderpy out of range error
Closes #276
See merge request openlp/openlp!97
2019-12-12 01:03:35 +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
Tim Bentley
6e3b702660
Merge branch 'refactor-theme-wizard-ui' into 'master'
...
Refactor theme wizard ui into separate pages
See merge request openlp/openlp!99
2019-12-11 19:31:49 +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
Tomas Groth
97ba02d1f1
Merge branch 'fix-qtwebengineprocess-path' into 'master'
...
Fix the path to QtWebEngineProcess on macOS
See merge request openlp/openlp!98
2019-12-10 16:57:30 +00:00
18303cdd0d
Fix the path to QtWebEngineProcess on macOS
2019-12-10 16:57:30 +00:00
Tim
9eb645cc37
Merge branch 'master' of gitlab.com:openlp/openlp
2019-12-07 20:20:21 +00:00
Tim Bentley
72bd9999eb
Merge branch 'fedora-vlc-instructions' into 'master'
...
Display more detailed instructions when VLC and pymediainfo are missing
See merge request openlp/openlp!96
2019-12-07 11:41:30 +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
ddc53eccb3
Merge branch 'disable-bibleserver' into 'master'
...
Disable BibleServer support for now
See merge request openlp/openlp!95
2019-12-04 22:10:14 +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
5cfce8c59b
Merge branch 'fix-pdf-paths' into 'master'
...
Fix a traceback when trying to display a PDF
See merge request openlp/openlp!94
2019-12-04 20:46:10 +00:00
Tomas Groth
64126cec23
Fix a traceback when trying to display a PDF
2019-12-04 20:46:10 +00:00
3094e6574d
Merge branch 'settings_2' into 'master'
...
Settings 2
See merge request openlp/openlp!91
2019-12-04 20:01:03 +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
Tomas Groth
205442fed7
Merge branch 'distro-detection' into 'master'
...
Add distribution detection in is_linux() function
See merge request openlp/openlp!93
2019-12-04 18:15:24 +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
Tim
c1808df463
Merge branch 'master' of gitlab.com:openlp/openlp
2019-12-03 19:55:55 +00:00
Tim Bentley
3b3f92d8b1
Merge branch 'test-improvements-bible_ref_parsing' into 'master'
...
Test improvements for bible ref parsing
See merge request openlp/openlp!92
2019-12-03 19:54:57 +00:00
Ee Savior
c3e6d3f776
Test improvements for bible ref parsing
2019-12-03 19:54:57 +00:00
Tim Bentley
e25859cf61
Merge branch 'fix_renderer_loading_issue' into 'master'
...
Fix renderer delayed loading issue
Closes #335
See merge request openlp/openlp!86
2019-12-03 17:30:35 +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
02c83bb8a8
Merge branch 'theme_updates' into 'master'
...
Theme updates and fixes
Closes #334
See merge request openlp/openlp!85
2019-12-02 18:07:41 +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
17927af24d
Merge branch 'test-improvements-test_media-v2' into 'master'
...
core-ui-media-__init__: Create test and fix docstring error for format_milliseconds(...). Achieve 100% coverage for __init__.py module
See merge request openlp/openlp!89
2019-12-02 18:02:13 +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
Tim
1d8ec19a89
Merge branch 'master' of gitlab.com:openlp/openlp
2019-11-29 17:07:28 +00:00
Tim Bentley
ffd25be049
Merge branch 'applocation-win-fix' into 'master'
...
Do not resolve paths, since it does not work as expected on windows.
See merge request openlp/openlp!90
2019-11-29 17:00:12 +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
5386195441
Merge branch 'master' of gitlab.com:openlp/openlp
2019-11-28 21:49:49 +00:00