16613 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Raoul Snyman	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
Raoul Snyman	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
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
Raoul Snyman	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
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	3ab4c4533b	Merge branch 'small-fixes' into 'master' ... Some small fixes See merge request openlp/openlp!79	2019-11-20 18:52:17 +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
Raoul Snyman	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
Raoul Snyman	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
Tim	08dd54a39e	Head	2019-11-10 09:44:51 +00:00
Raoul Snyman	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
Tim	820bf131c5	Merge branch 'master' of gitlab.com:openlp/openlp	2019-11-03 21:28:11 +00:00
Raoul Snyman	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
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
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
Raoul Snyman	06339426d2	Fix presentations on Linux (and hopefully Windows too)	2019-11-03 20:46:21 +00:00
Tim	a796b965b3	Merge branch 'master' of gitlab.com:openlp/openlp	2019-11-02 07:15:46 +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
Raoul Snyman	a019b42636	Force the display checkbox to be selected for at least 1 screen	2019-11-02 07:05:08 +00:00
Tim	1a355953b8	Merge branch 'master' of gitlab.com:openlp/openlp	2019-11-02 07:03:16 +00:00
Raoul Snyman	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
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
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	f8117fc795	Merge branch 'master' of gitlab.com:openlp/openlp	2019-11-01 20:46:24 +00:00
Tim	57dd0897ae	Head	2019-11-01 15:56:34 +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
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
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