Commit Graph

16651 Commits

Author SHA1 Message Date
Tim Bentley
3dcac055be Migrate Media and add Pytest-qt
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-09 20:24:05 +00:00
Tim Bentley
15d1198ae9 Merge branch 'fix-settings-crash' into 'master'
Fix common settings crash

See merge request openlp/openlp!133
2020-02-09 08:01:15 +00:00
Daniel
0b3ee4e1ba Fix common settings crash 2020-02-09 08:01:15 +00:00
Tim Bentley
b71ccfd09e Merge branch 'settings_core_4' into 'master'
Settings core 4

See merge request openlp/openlp!131
2020-02-07 19:53:52 +00:00
Tim Bentley
7cdc2a68de Migrate Projectors
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-07 19:53:52 +00:00
Tomas Groth
11b24c8e1f Merge branch 'multiple-streams' into 'master'
Add support for multiple streams.

See merge request openlp/openlp!116
2020-02-04 20:35:35 +00:00
Tomas Groth
d9b65d8873 Made the stream selector a lightweight version of the VLC capture device selector. Still some work to do. 2020-02-04 20:35:35 +00:00
63ae19e8db Merge branch 'bug320' into 'master'
Deregister screen-updates to the theme widget when it closes. Fixes #320.

Closes #320

See merge request openlp/openlp!130
2020-02-03 23:03:24 +00:00
Tomas Groth
442dc7d0d2 Deregister screen-updates to the theme widget when it closes. Fixes #320. 2020-02-03 23:03:24 +00:00
Tim Bentley
4486b4b5a2 Merge branch 'settings_core_3' into 'master'
Settings core 3

See merge request openlp/openlp!129
2020-02-01 21:12:07 +00:00
Tim Bentley
020661059f Migrate Display
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-01 21:12:07 +00:00
d08762426c Merge branch 'settings_core_2' into 'master'
Settings core 2

See merge request openlp/openlp!127
2020-01-29 06:50:09 +00:00
Tim Bentley
45e38c4959 Migrate API to Settings
Fix missing / incorrect copyright

Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-29 06:50:09 +00:00
89504256f0 Merge branch 'implement-new-api' into 'master'
Implement new api

See merge request openlp/openlp!31
2020-01-27 22:57:58 +00:00
Simon Hanna
ef2f798f6f Update remote API to use Flask, and be more RESTful 2020-01-27 22:57:58 +00:00
Tim Bentley
52d811331c Merge branch 'settings_plugins_3' into 'master'
Settings plugins 3 - More Plugin Migrations

See merge request openlp/openlp!125
2020-01-26 17:12:45 +00:00
Tim Bentley
fa97550301 Migrate more plugins for settings
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-26 17:12:45 +00:00
cc1a19efea Merge branch 'settings_plugins_2' into 'master'
Settings plugins 2

See merge request openlp/openlp!124
2020-01-21 16:59:46 +00:00
Tim Bentley
86f85081b6 Migrate plugins from Settings() Alert and Bibles
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-21 16:59:46 +00:00
Tim Bentley
2422208e6b Merge branch 'import-fixes' into 'master'
Import fixes

See merge request openlp/openlp!123
2020-01-18 21:45:47 +00:00
Tomas Groth
1ebc6737d7 Made the bibel and song import more robust.
Tested the importers by loading a text file, a png file and an xml file.
2020-01-18 21:45:47 +00:00
Tomas Groth
9dd8f51773 Merge branch 'settings_plugins_1' into 'master'
Migrate Plugins and media item

See merge request openlp/openlp!122
2020-01-18 21:00:13 +00:00
Tim Bentley
debbced7e3 Update the plugin classes and remove the uneeded code
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-18 21:00:13 +00:00
Tomas Groth
3a2a3cba9a Merge branch 'fade-transition-speed' into 'master'
Theme fade transition speed

Closes #331

See merge request openlp/openlp!114
2020-01-18 14:07:40 +00:00
Tim Bentley
74cb7218f9 Merge branch 'fix-chords-customs-splits' into 'master'
Properly detect chords, support >5 optional splits

Closes #278

See merge request openlp/openlp!120
2020-01-16 17:26:13 +00:00
b85f1db06f
Properly detect chords, support >5 optional splits
- Properly detect only chords in square brackets
- Properly detect Bibles so that custom slides are rendered as text items
- Make more than 5 optional splits work (fixes #278)
2020-01-15 22:05:26 -07:00
Tim Bentley
781ff2c7ea Merge branch 'media_1' into 'master'
Text Over Video.

See merge request openlp/openlp!119
2020-01-12 21:03:40 +00:00
Tim Bentley
8e9cc53852 Migrate media to new style tests
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-12 21:03:40 +00:00
0e6fd4a57a Merge branch 'alpha-fixes3' into 'master'
A few fixes for the alpha.

See merge request openlp/openlp!118
2020-01-06 21:15:12 +00:00
Tomas Groth
a0616ddf0f A few fixes for the alpha. 2020-01-06 21:15:11 +00:00
Tomas Groth
0d2e9b9aa6 Merge branch 'alpha-fixes2' into 'master'
A few alpha fixes

See merge request openlp/openlp!113
2020-01-04 21:31:04 +00:00
Tomas Groth
e4377e9865 Use the _implementedInterfaces property on windows to signal the implementation of XSlideShowListener. 2020-01-04 21:31:04 +00:00
Tim Bentley
f5730fbb38 Merge branch 'settings_5' into 'master'
Fix up APP Tests and Refactor OpenLP

See merge request openlp/openlp!115
2020-01-04 21:24:32 +00:00
Tim Bentley
5aa2065741 Change Structure of OpenLP and move a test
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-04 21:24:32 +00:00
Tim Bentley
04c48313d0 Merge branch 'fix-bibleserver' into 'master'
Fix bibleserver integration

See merge request openlp/openlp!117
2020-01-04 07:10:13 +00:00
Tomas Groth
c20b7f5301 Fix bibleserver integration. 2020-01-03 22:50:00 +01:00
7dc9cbe6d0 Merge branch 'cleanups' into 'master'
Cleanups and update the decade

See merge request openlp/openlp!110
2020-01-01 02:53:08 +00:00
Tim Bentley
6ea4893ad6 Change Year
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-01 02:53:08 +00:00
Daniel
3f38ccfd18 change fade transition speed and removed deprecated transitions 2019-12-31 09:08:40 +13:00
Tim Bentley
a82846c60e Merge branch 'settings4' into 'master'
Settings4

See merge request openlp/openlp!108
2019-12-30 08:42:49 +00:00
Tim Bentley
63f67f6e17 Migrate setting definitions to Core from plugins
Signed-off-by: Tim <tim.bentley@gmail.com>
2019-12-30 08:42:49 +00:00
Tomas Groth
5978ff9bf9 Merge branch 'alpha_fixes_2' into 'master'
Alpha fixes 2

See merge request openlp/openlp!112
2019-12-24 07:40:58 +00:00
Tim
a9d4fb99dd
Fix file attributes 2019-12-24 06:50:18 +00:00
Tim
2c8cdd2bdc
Merge branch 'master' of gitlab.com:openlp/openlp 2019-12-24 06:46:47 +00:00
74a207e135 Merge branch 'alpha-fixes1' into 'master'
Fixes for the first Alpha:

Closes #354

See merge request openlp/openlp!111
2019-12-24 04:04:16 +00:00
Tomas Groth
b54a9931bd Fixes for the first Alpha:
* Handle git styled version tags/hashes instead of bzr. Fixes part of #351.
 * Fix planningcenter traceback, fixes #354.
 * Fix minor stuff detected by pylint.
2019-12-23 23:17:06 +01:00
9034d140bf Merge branch 'add-vlc-to-path' into 'master'
Add VLC path to PATH environment variable

See merge request openlp/openlp!107
2019-12-21 22:03:17 +00:00
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