db8e21fee4
Merge branch 'set-actions-on-display' into 'master'
...
Enable keyboard shortcuts for the display window
See merge request openlp/openlp!69
2019-11-01 20:49:15 +00:00
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
f8117fc795
Merge branch 'master' of gitlab.com:openlp/openlp
2019-11-01 20:46:24 +00:00
57dd0897ae
Head
2019-11-01 15:56:34 +00:00
b151d99274
Merge branch 'splashscreen2' into 'master'
...
Initial release of the test for SplashScreen.py
See merge request openlp/openlp!68
2019-11-01 15:44:53 +00:00
ecaa587e44
Initial release of the test for SplashScreen.py
2019-11-01 15:44:53 +00:00
99508388d1
Merge branch 'issue-302' into 'master'
...
Fix issue 302 with theme previews
Closes #302
See merge request openlp/openlp!63
2019-11-01 12:26:47 +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
0c6c457a45
Merge branch 'shortcut' into 'master'
...
Configure Custom shortcut error fix
Closes #321
See merge request openlp/openlp!65
2019-11-01 11:04:44 +00:00
2f94f35a42
Configure Custom shortcut error fix
2019-11-01 11:04:44 +00:00
Raoul Snyman
2d0254f45a
Merge branch 'fix-arch-tests' into 'master'
...
Fix the tests so that the Arch runner goes back to green
See merge request openlp/openlp!66
2019-10-31 20:40:19 +00:00
Raoul Snyman
8cc2e3af9d
Fix the tests so that the Arch runner goes back to green
2019-10-31 20:40:18 +00:00
a4e17d2bf9
Merge branch 'revert-9bc14eda' into 'master'
...
Revert "Merge branch 'appveyor-py38' into 'master'"
See merge request openlp/openlp!67
2019-10-31 20:34:25 +00:00
62e19eedd8
Revert "Merge branch 'appveyor-py38' into 'master'"
...
This reverts merge request !64
2019-10-31 20:34:25 +00:00
Raoul Snyman
9bc14edaae
Merge branch 'appveyor-py38' into 'master'
...
Update appveyor.yml to use python 3.8
See merge request openlp/openlp!64
2019-10-31 18:35:55 +00:00
da252680ce
Update appveyor.yml to use python 3.8
2019-10-31 18:35:55 +00:00
37e6a420e5
Merge branch 'allow-x11-override' into 'master'
...
Allow x11 override
Closes #316
See merge request openlp/openlp!61
2019-10-30 17:33:07 +00:00
cef0e67bd2
Allow x11 override
2019-10-30 17:33:07 +00:00
Raoul Snyman
60a69f8666
Merge branch 'remove-lint-stage' into 'master'
...
Remove lint stage to speed up tests
See merge request openlp/openlp!59
2019-10-29 22:58:30 +00:00
Raoul Snyman
c0314c8278
Merge branch 'fix-images-not-displaying' into 'master'
...
Fix display issues
Closes #307 and #313
See merge request openlp/openlp!60
2019-10-29 22:54:14 +00:00
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
eda847a8db
Merge branch 'search_icon' into 'master'
...
Changed plugin search clear ICON
Closes #315 and #267
See merge request openlp/openlp!58
2019-10-29 16:13:18 +00:00
5677cf6a40
Changed plugin search clear ICON
2019-10-29 16:13:18 +00:00
722112cf23
Remove lint stage to speed up tests
2019-10-26 19:59:24 +02:00
4408797e52
Merge branch 'fix-default-location-buttons' into 'master'
...
Fix "Use default location" buttons
Closes #306
See merge request openlp/openlp!53
2019-10-26 10:00:07 +00:00
76ff4be598
Fix "Use default location" buttons
2019-10-26 10:00:07 +00:00
4d395ee6e7
Merge branch 'new-rendering-engine-transitions' into 'master'
...
New rendering engine transitions
Closes #308
See merge request openlp/openlp!54
2019-10-26 09:57:00 +00:00
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
1b9e68023e
Merge branch 'fix-shadows-toggle' into 'master'
...
Fix shadows toggle button
Closes #305
See merge request openlp/openlp!55
2019-10-26 09:37:20 +00:00
34eb93f565
Fix shadows toggle button
2019-10-26 09:37:20 +00:00
2d2576aa6c
Merge branch 'master' of gitlab.com:openlp/openlp
2019-10-26 09:25:26 +01:00
Raoul Snyman
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
3acd4569b9
Merge branch 'fix-text-alignment-on-display' into 'master'
...
Fix text alignment on display
Closes #298
See merge request openlp/openlp!50
2019-10-24 20:22:49 +00:00
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
bc51c7ca7f
Do not test PyMuPDF if it's not installed
...
Fixes #288
2019-10-24 19:56:08 +02:00
Raoul Snyman
66f19e05a1
Merge branch 'fix-cached-theme-background-management' into 'master'
...
Fix cached theme background management
Closes #145 and #301
See merge request openlp/openlp!49
2019-10-23 22:54:30 +00:00
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
1a2aabf8a4
Merge branch 'display-tests' into 'master'
...
Run the Display JS tests as well
See merge request openlp/openlp!52
2019-10-23 20:09:37 +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
Raoul Snyman
3d1af40823
Merge branch 'printservicelabels' into 'master'
...
Updated Print Service labels for Copy and Custom Footer Text
Closes #270
See merge request openlp/openlp!51
2019-10-23 04:22:28 +00:00
212d4c8678
Updated label for Copy and Custom Footer Text
2019-10-21 20:05:35 -04:00
1e82419f1b
Merge branch 'master' of gitlab.com:openlp/openlp
2019-10-18 17:59:43 +01:00
846a77cae7
Merge branch 'skip-tests' into 'master'
...
Skip certain tests if we're running on GitLab or AppVeyor
See merge request openlp/openlp!46
2019-10-18 16:54:00 +00:00
Raoul Snyman
1c4224e3d7
Skip certain tests if we're running on GitLab or AppVeyor
2019-10-18 16:54:00 +00:00
Raoul Snyman
6eb81e2f61
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 17:48:19 +01:00
Raoul Snyman
d98b84bd26
Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it.
2019-10-18 17:48:18 +01:00
Raoul Snyman
0fd6710075
Try to fix paths in coverage report generation
...
- Add the local path to coverage config
- Fix the paths before generating an HTML report
2019-10-18 17:48:17 +01:00
26d263bc71
Merge branch 'theme-progress-dialog' into 'master'
...
Create a Theme Preview dialog, plus some theme background fixes
Closes #283 and #299
See merge request openlp/openlp!45
2019-10-18 06:12:10 +00: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
362a775a55
Merge branch 'test-windows' into 'master'
...
Set up a GitLab runner on a Windows 7 VM, and configure the pipeline to use it.
See merge request openlp/openlp!43
2019-10-17 11:03:39 +00:00
Tomas Groth
Tim
John Morris
Philip Ridout
Raoul Snyman
Daniel
Simon Hanna