Tim Bentley
bf7b091db0
Merge branch 'fix-presentations-on-linux' into 'master'
...
Fix presentations on Linux (and hopefully Windows too)
Closes #269
See merge request openlp/openlp!75
2019-11-03 20:46:21 +00:00
06339426d2
Fix presentations on Linux (and hopefully Windows too)
2019-11-03 20:46:21 +00:00
Tim Bentley
656a8479a9
Merge branch 'fix-clone-theme-background-missing-source' into 'master'
...
Fix clone theme with missing background source
Closes #322
See merge request openlp/openlp!70
2019-11-02 07:14:10 +00:00
Daniel
1ac6c052c7
Fix clone theme with missing background source
2019-11-02 07:14:10 +00:00
Tim Bentley
1cc9fd9970
Merge branch 'force-display-screen' into 'master'
...
Force the display checkbox to be selected for at least 1 screen
See merge request openlp/openlp!73
2019-11-02 07:05:08 +00:00
a019b42636
Force the display checkbox to be selected for at least 1 screen
2019-11-02 07:05:08 +00:00
724f33c8ee
Merge branch 'ftw-autodetect-display' into 'master'
...
Pre-select a screen as the display if there is no screen config
Closes #302 , #276 , and #285
See merge request openlp/openlp!72
2019-11-02 06:21:23 +00:00
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
Tomas Groth
cf675a7e7b
Merge branch 'fix-display-keypress-issues' into 'master'
...
Fix display keypress issues
Closes #323
See merge request openlp/openlp!71
2019-11-02 05:21:02 +00:00
Daniel
a94449d8bc
Fix display keypress issues
2019-11-02 05:21:01 +00:00
Tomas Groth
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
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
Tim Bentley
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
John Morris
ecaa587e44
Initial release of the test for SplashScreen.py
2019-11-01 15:44:53 +00:00
Philip Ridout
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
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
Tim Bentley
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
John Morris
2f94f35a42
Configure Custom shortcut error fix
2019-11-01 11:04:44 +00:00
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
8cc2e3af9d
Fix the tests so that the Arch runner goes back to green
2019-10-31 20:40:18 +00:00
Tomas Groth
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
Tomas Groth
62e19eedd8
Revert "Merge branch 'appveyor-py38' into 'master'"
...
This reverts merge request !64
2019-10-31 20:34:25 +00:00
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
Tomas Groth
da252680ce
Update appveyor.yml to use python 3.8
2019-10-31 18:35:55 +00:00
Tim Bentley
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
Daniel
cef0e67bd2
Allow x11 override
2019-10-30 17:33:07 +00:00
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
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
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
Tomas Groth
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
John Morris
5677cf6a40
Changed plugin search clear ICON
2019-10-29 16:13:18 +00:00
Simon Hanna
722112cf23
Remove lint stage to speed up tests
2019-10-26 19:59:24 +02:00
Philip Ridout
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
Daniel
76ff4be598
Fix "Use default location" buttons
2019-10-26 10:00:07 +00:00
Philip Ridout
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
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
Philip Ridout
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
Daniel
34eb93f565
Fix shadows toggle button
2019-10-26 09:37:20 +00:00
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
Tim Bentley
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
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
Simon Hanna
bc51c7ca7f
Do not test PyMuPDF if it's not installed
...
Fixes #288
2019-10-24 19:56:08 +02:00
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
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
Tim Bentley
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
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
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
John Morris
212d4c8678
Updated label for Copy and Custom Footer Text
2019-10-21 20:05:35 -04:00
Tim Bentley
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
1c4224e3d7
Skip certain tests if we're running on GitLab or AppVeyor
2019-10-18 16:54:00 +00:00