Commit Graph

16776 Commits

Author SHA1 Message Date
771d579147 Merge branch 'fixes2' into 'master'
No internet traceback

Closes #572

See merge request openlp/openlp!202
2020-05-30 06:35:09 +00:00
Mattias Põldaru
0419e80aec No internet traceback 2020-05-30 06:35:09 +00:00
73ece5dfd2 Merge branch 'translations-29052020' into 'master'
Translations 29052020

See merge request openlp/openlp!201
2020-05-30 06:34:22 +00:00
Tim Bentley
b3b9b6d288 Translations 29052020 2020-05-30 06:34:22 +00:00
9800aa18e4 Merge branch 'fixes' into 'master'
Fix a freeze on Windows

Closes #570

See merge request openlp/openlp!199
2020-05-30 06:33:39 +00:00
Mattias Põldaru
7f4f6a2bfa Fix a freeze on Windows 2020-05-30 06:33:39 +00:00
Tim Bentley
53b58f777f Merge branch 'library-toolbar' into 'master'
UI changes

See merge request openlp/openlp!193
2020-05-26 20:29:06 +00:00
Mattias Põldaru
2e58939382 Change preview/live left/right icons to up/down, as the slides are shown in preview, and just as keyboard shortcuts. 2020-05-26 20:29:05 +00:00
72657759cf Merge branch 'various_fixes' into 'master'
Various fixes

Closes #553, #72, #56, #552, and #527

See merge request openlp/openlp!195
2020-05-25 05:01:12 +00:00
Daniel
b4648ee618 Fix preview flicker
fixes #553
This line is not needed as the display will move
to the first slide by default.
2020-05-25 05:01:12 +00:00
Tim Bentley
51a57ae5f2 Merge branch 'fix_broken_settings' into 'master'
Fix broken settings

Closes #61, #478, and #479

See merge request openlp/openlp!189
2020-05-21 20:17:03 +00:00
Daniel
59ab4a1ad4 remove unused themes/wrap footer setting
Maybe add a new theme attribute for this later
2020-05-21 20:17:03 +00:00
Tim Bentley
a77b57d334 Merge branch 'api_updates_1705' into 'master'
Resolve issues with theme changes.

See merge request openlp/openlp!194
2020-05-20 07:40:23 +00:00
Tim Bentley
67f4a0cc81 Resolve issues with theme changes.
Add new clear api's
2020-05-20 07:40:23 +00:00
8d58fb76ca Merge branch 'fixes' into 'master'
Random fixes

See merge request openlp/openlp!191
2020-05-18 18:00:42 +00:00
Mattias Põldaru
4c2c7b6ab1 Various fixes:
- Remove a traceback on exiting OpenLP
- Add back toolbar separator
- Fix biblegateway webpage parsing for tests
- Remove live_display argument from VlcPlayer.setup, is incorrectly passed the preview value
2020-05-18 18:00:40 +00:00
Tim Bentley
a304c98502 Merge branch 'fix-api-issues' into 'master'
Fix various issues and return current theme in API

Closes #541

See merge request openlp/openlp!192
2020-05-16 07:31:34 +00:00
181b4fdcc9
Fix various issues and return current theme in API:
- New API method to return current theme
- Use single method to set service items via both position and uuid
- Update tests to match above new features
- Fix issue where chords were not being returned to the API
- Fix the clear/backspace icon (the old one doesn't exist in Debian)
2020-05-15 23:11:55 -07:00
e8db9dd524 Merge branch 'api_changes' into 'master'
Api changes and fixes

See merge request openlp/openlp!190
2020-05-16 06:11:21 +00:00
Tim Bentley
6876bbd531 Clean up Apis and remove duplicate files.
Add new API to help testings
2020-05-16 06:11:21 +00:00
Tim Bentley
a9a96146b0 Merge branch 'alpha-fixes6' into 'master'
Fix a traceback to wrongful path to string convertion

See merge request openlp/openlp!187
2020-05-11 18:28:37 +00:00
Tomas Groth
da373ef1d5 Fix a traceback to wrongful path to string convertion 2020-05-10 22:04:13 +02:00
Tim Bentley
1f9884e64a Merge branch 'web_remote_fixes' into 'master'
Change server send correct files for new web-remote

Closes #516

See merge request openlp/openlp!184
2020-05-08 08:26:06 +00:00
3728b3c3ac Merge branch 'hide-theme-link-button' into 'master'
Various small fixes

See merge request openlp/openlp!181
2020-05-08 05:44:41 +00:00
Tomas Groth
b2843c50a1 Various small fixes
* Correctly hide network stream button in the theme background page.
* Fix traceback in the FTW due to the mainwindow (which is not yet created) being used.
2020-05-08 05:44:41 +00:00
d0008497bd Merge branch 'translations-07052020b' into 'master'
Translations 07052020b

See merge request openlp/openlp!183
2020-05-08 05:42:56 +00:00
Tim Bentley
164091210c Translations 07052020b 2020-05-08 05:42:55 +00:00
Daniel
58b622a196 Change server send correct files for new web-remote 2020-05-08 13:04:38 +12:00
Tomas Groth
63de3d2021 Merge branch 'view_mode_radio_buttons' into 'master'
View mode radio buttons

Closes #483

See merge request openlp/openlp!168
2020-05-07 06:51:29 +00:00
Daniel
9ac001e8e3 Change live toolbar to use radio buttons
Also removed the `live -> preview` button
Simplified button handler functions (removing duped code)
Set new showScreen shortcut to spacebar
Removed desktopScreenEnable button and shortcut
2020-05-07 06:51:29 +00:00
8ca3b08880 Merge branch 'liveworship-change' into 'master'
Liveworship import change

See merge request openlp/openlp!180
2020-05-07 05:19:20 +00:00
Tomas Groth
b3298d69f4 Liveworship import change 2020-05-07 05:19:20 +00:00
2e86ef8c32 Merge branch 'new-servicefile-format' into 'master'
New service file format

See merge request openlp/openlp!8
2020-05-07 05:18:37 +00:00
Tomas Groth
937c6c3e81 New service file format 2020-05-07 05:18:37 +00:00
Tomas Groth
d2881ad6e1 Merge branch 'master' into 'master'
Fix errors in translatable texts.

See merge request openlp/openlp!179
2020-05-05 18:17:22 +00:00
Mattias Põldaru
e95ee62574 Fix errors in translatable texts. 2020-05-05 18:17:21 +00:00
Tim Bentley
ca6ed027d3 Merge branch 'alpha-fixes5' into 'master'
Fix loading optical and streaming items from servicemanager.

See merge request openlp/openlp!178
2020-05-02 20:10:24 +00:00
Tomas Groth
16f16c74cb Merge branch 'logging_fixes' into 'master'
Logging and Powerpoint fixes

See merge request openlp/openlp!177
2020-05-02 18:53:56 +00:00
Tim Bentley
2223a56268 Logging and Powerpoint fixes 2020-05-02 18:53:56 +00:00
Tim Bentley
6370a71d64 Merge branch 'translations-02052020' into 'master'
Translations 02052020

See merge request openlp/openlp!176
2020-05-02 18:45:38 +00:00
Tim Bentley
5d5e2ed041 Translations 02052020 2020-05-02 18:45:37 +00:00
Tomas Groth
1fb99e543e When creating media service items, validate items after adding capabilities. Fixes loading optical and streaming items from servicemanager. 2020-05-02 14:04:53 +02:00
d4f75e4fb4 Merge branch 'smooth_transparency_transitions' into 'master'
Smooth transparency transitions

Closes #507

See merge request openlp/openlp!169
2020-04-27 16:20:53 +00:00
Daniel
f4e30c15cc Always use transparency when going to desktop
Except when the display workaround is enabled of course :)
2020-04-27 16:20:51 +00:00
Tim Bentley
c203de0b7a Merge branch 'fix-pdf-from-servicemanager' into 'master'
Fix loading PDF items from the servicemanager

See merge request openlp/openlp!175
2020-04-27 11:50:34 +00:00
Tomas Groth
3de2435631 Fix loading PDF items from the servicemanager
In slidecontroller::_process_item a copy was made of the serviceitem, but it wasen't always used, which caused issues since that item was converted from a presentation/command item to an image item for PDFs.
2020-04-27 11:50:34 +00:00
Tim Bentley
78aa6757fa Merge branch 'api_improvments' into 'master'
Api improvements

See merge request openlp/openlp!174
2020-04-26 21:37:36 +00:00
Tim Bentley
da01b2a8f2 Api improvements 2020-04-26 21:37:35 +00:00
Tomas Groth
b85245465e Merge branch 'upload-to-pypi' into 'master'
Add deploying to PyPI when a tag is created

See merge request openlp/openlp!173
2020-04-24 10:56:12 +00:00
Tomas Groth
1c2727b3d9 Merge branch 'issue-471' into 'master'
Download version from get.openlp.org

Closes #471

See merge request openlp/openlp!172
2020-04-24 10:55:41 +00:00