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
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 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 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 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 Bentley
f5ffc6d57e
Merge branch 'test-improvements' into 'master'
...
Test improvements
See merge request openlp/openlp!87
2019-11-26 19:32:16 +00:00
Ee Savior
f50b81b9fb
Test improvements
2019-11-26 19:32:16 +00:00
f8e499eaf2
Merge branch 'settings_1a' into 'master'
...
Migrate Settings - Part 1
See merge request openlp/openlp!84
2019-11-26 17:49:42 +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
Tim Bentley
a9c03092ed
Merge branch 'font-select-widget' into 'master'
...
Font selection widget
See merge request openlp/openlp!83
2019-11-22 16:40:10 +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
3ab4c4533b
Merge branch 'small-fixes' into 'master'
...
Some small fixes
See merge request openlp/openlp!79
2019-11-20 18:52:17 +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
e94f2b8134
Merge branch 'alpha_1a' into 'master'
...
Fix Media crash when blanking running media
See merge request openlp/openlp!81
2019-11-20 05:36:36 +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
862a5e563f
Merge branch 'spelling' into 'master'
...
Corrected typos in 4 files
Closes #329
See merge request openlp/openlp!78
2019-11-15 16:26:08 +00:00
John Morris
14b763d677
Corrected typos in 4 files
2019-11-15 16:26:08 +00:00
Tim Bentley
a7e7b1fb46
Merge branch 'translations-12112019' into 'master'
...
Update Translations as at 12112019
See merge request openlp/openlp!77
2019-11-13 17:25:01 +00:00
Tim Bentley
f63f7939ac
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-13 17:25:00 +00:00
83c8a87ce2
Merge branch 'planningcenter_plugin' into 'master'
...
Planningcenter plugin
See merge request openlp/openlp!44
2019-11-09 16:17:41 +00:00
John Kirkland
dbcdf11c0a
Planningcenter plugin
2019-11-09 16:17:41 +00:00
b9e26a1cfb
Merge branch 'alpha_1' into 'master'
...
Media Fixes for Alpha 1
See merge request openlp/openlp!57
2019-11-03 21:17:47 +00:00