Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/animated-alerts into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/animated-alerts/+merge/372792 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/reveal-css into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/reveal-css/+merge/372798 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/pyro4-maclo into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/pyro4-maclo/+merge/372748 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/animated-alerts into lp:openlp
Review: Needs Fixing
Looks good but the js stuff goes over my head!
One issue in alertsmanager and half done clean up.
Diff comments:
>
> === modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
> --- openlp/plugins/alerts/lib/alertsmanager.py2019-04-13 13:00:22
> +
> +++ openlp/plugins/alerts/lib/alertsmanager.py2019-09-12 22:55:07
> +
> @@ -83,8 +85,26 @@
> not Settings().value('core/display on
> monitor')):
> return
> text = self.alert_list.pop(0)
> -alert_tab = self.parent().settings_tab
> -self.live_controller.displays[0].alert(text, alert_tab.location)
> +
> +# Get the rgb color format of the font & background hex colors from
> settings
> +rgb_font_color =
> self.hex_to_rgb(QtGui.QColor(Settings().value('alerts/font color')))
> +rgb_background_color =
> self.hex_to_rgb(QtGui.QColor(Settings().value('alerts/background color')))
> +
> +# Put alert settings together in dict that will be passed to Display
> in Javascript
> +alert_settings = {
> +'backgroundColor': rgb_background_color,
> +'location': Settings().value('alerts/location'),
> +'fontFace': Settings().value('alerts/font face'),
> +'fontSize': Settings().value('alerts/font size'),
> +'fontColor': rgb_font_color,
> +'timeout': Settings().value('alerts/timeout'),
> +'repeat': Settings().value('alerts/repeat'),
> +'scroll': Settings().value('alerts/scroll')
> +}
> +self.live_controller.displays[0].alert(text,
> json.dumps(alert_settings))
> +# Check to see if we have a timer running.
> +# if self.timer_id == 0:
> +#self.timer_id = self.startTimer(int(alert_tab.timeout) * 1000)
Do we need this? What is controlling the timing as we have a confusion here.
If the display is managing the timing then remove all the timer code please
>
> def timerEvent(self, event):
> """
--
https://code.launchpad.net/~raoul-snyman/openlp/animated-alerts/+merge/372736
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1842523] Re: trunk V2898 adding video file to Service causes errors
nager object at 0x12061530>> for live_display_active 2019-09-03 19:22:52,200 MainThread openlp.core.common.registry ERROROpenLP Error trace File run_openlp.py at line 87 called start() File run_openlp.py at line 83 called main() File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py at line 454 called sys.exit(application.run(qt_args)) File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py at line 145 called return self.exec() File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py at line 80 called result = QtWidgets.QApplication.exec() File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\ui\slidecontroller.py at line 1076 called self.hide_plugin(checked) File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\mixins.py at line 62 called return func(*args, **kwargs) File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\ui\slidecontroller.py at line 1131 called [self.service_item, self.is_live]) File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\registry.py at line 136 called trace_error_handler(log) File C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\__init__.py at line 101 called for tb in traceback.extract_stack(): 2019-09-03 19:22:52,205 MainThread openlp.core.common.registry ERROREvent images_unblank called but not registered -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1842523 Title: trunk V2898 adding video file to Service causes errors Status in OpenLP: Confirmed Bug description: Windows 10 32 bit trunk V2898 Single display with custom screen 1024x768 in OpenLP settings I loaded a small moving background in MPG format. I checked and the issue with not being able to edit a song is still valid. The media item was shown in the Library. I used Drag and Drop to add the media item to the middle of a service with multiple items in it. Error 1 The item was displayed in the ServiceEvery item in the Service below where I added the media item vanished. I double clicked the slide above the media item to send it to the live display. The slide was displayed as expected. Live display enabled. Unexpected Behavior I pressed the down arrow on the keyboard and the live display vanished and returned with the video playing. I pressed the Esc key to end the live screen and shut down OpenLP. Error 2 I was not asked to save the modified Service. When I restarted OpenLP the media items as still there, but the Service did not show the Media item... In the terminal the following information was displayed. Error 3? [16973d88] direct3d11 vout display error: Could not Create the D3D11 device. (hr=0x80004001) [16973d88] direct3d11 vout display error: Direct3D11 could not be opened [16973d88] direct3d11 vout display error: SetThumbNailClip failed: 0x800706f4 [mpeg2video @ 16fdabc0] get_buffer() failed [mpeg2video @ 16fdabc0] thread_get_buffer() failed [mpeg2video @ 16fdabc0] get_buffer() failed (-12 ) [16973d88] direct3d9 vout display error: SetThumbNailClip failed: 0x800706f4 I am including the OpenLP.log file as it shows a trace dump. The Error.log is blank To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1842523/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1842523] Re: trunk V2898 adding video file to Service causes errors
2019-09-03 19:22:40,041 MainThread openlp.core.ui.servicemanager.ServiceManager
ERRORException in add_service_item : 'QIcon' object is not
subscriptable
2019-09-03 19:22:40,075 MainThread openlp.core.common.registry
ERROROpenLP Error trace
File run_openlp.py at line 87
called start()
File run_openlp.py at line 83
called main()
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py
at line 454
called sys.exit(application.run(qt_args))
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py
at line 145
called return self.exec()
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\app.py
at line 80
called result = QtWidgets.QApplication.exec()
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\widgets\views.py
at line 335
called drag.exec(QtCore.Qt.CopyAction)
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\ui\servicemanager.py
at line 1589
called
Registry().execute('{plugin}_add_service_item'.format(plugin=plugin), replace)
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\registry.py
at line 132
called trace_error_handler(log)
File
C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\__init__.py
at line 101
called for tb in traceback.extract_stack():
2019-09-03 19:22:40,075 MainThread openlp.core.common.registry
ERRORException for function >
Traceback (most recent call last):
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\registry.py",
line 127, in execute
result = function(*args, **kwargs)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\lib\plugin.py",
line 274, in process_add_service_event
self.media_item.on_add_click()
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\lib\mediamanageritem.py",
line 576, in on_add_click
self.add_to_service(item, position=drop_position)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\lib\mediamanageritem.py",
line 600, in add_to_service
self.service_manager.add_service_item(service_item, replace=replace,
position=position)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\mixins.py",
line 69, in wrapped
raise e
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\mixins.py",
line 62, in wrapped
return func(*args, **kwargs)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\ui\servicemanager.py",
line 1384, in add_service_item
self.repaint_service_list(self.drop_position, -1)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\mixins.py",
line 69, in wrapped
raise e
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\common\mixins.py",
line 62, in wrapped
return func(*args, **kwargs)
File
"C:\Users\Kathy\Documents\Church\source\python\openlp_trunk_2898\openlp\openlp\core\ui\servicemanager.py",
line 1249, in repaint_service_list
child.setText(0, text[:40])
TypeError: 'QIcon' object is not subscriptable
2019-09-03 19:22:49,444 MainThread openlp.core.ui.servicemanager.ServiceManager
DEBUGEntering make_live
2019-09-03 19:22:49,444 MainThread openlp.core.ui.servicemanager.ServiceManager
DEBUGEntering find_service_item
** Changed in: openlp
Assignee: (unassigned) => Tim Bentley (trb143)
** Changed in: openlp
Status: New => Confirmed
** Changed in: openlp
Importance: Undecided => Critical
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1842523
Title:
trunk V2898 adding video file to Service causes errors
Status in OpenLP:
Confirmed
Bug description:
Windows 10 32 bit
trunk V2898
Single display with custom screen 1024x768 in OpenLP settings
I loaded a small moving background in MPG format. I checked and the issue
with not being able to edit a song is still valid.
The media item was shown in the Library. I used Drag and Drop to add the
media item to the middle of a service with multiple items in it.
Error 1
The item was displayed in the ServiceEvery item in the Service below
where I added the media item vanished.
I double clicked the slide above the media i
[Openlp-core] [Bug 1842756] Re: trunk v2898 file lookup preset can't find files
Video Backgrounds is in the processing of changing so this will not work at present. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1842756 Title: trunk v2898 file lookup preset can't find files Status in OpenLP: New Bug description: Windows 10 32 bit trunk version 2898 Clean Install Something is messed up in the file lookup preset. Steps to recreate 1. use a text editor to create a file with a .wmv extension 2. open OpenLP and start to create a new Theme 3. Choose Video for the background type 4. try to locate the file you createdit does not show up 5. change the preset to "All Files" and the file will be visible in the directory you put it in To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1842756/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
Review: Needs Fixing You have left the python3 construct in the openlp/__main__.py which leaves this as an entry point. Please confirm this is correct or remove. -- https://code.launchpad.net/~bastian-germann/openlp/main/+merge/368590 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1840092] Re: version 2889 song edit window 'save and preview' button only saves
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1840092 Title: version 2889 song edit window 'save and preview' button only saves Status in OpenLP: Fix Committed Bug description: Windown 10 32 bit Version 2889 of Trunk To recreate this; 1. select a song in the song plugin 2. select the edit button in the song library 3. modify a verse 4. select the 'save and preview' button 5. the edit window will close, but the preview never happens. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1840092/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1841196] Re: V2892 Service Theme not working
** Changed in: openlp Milestone: None => 2.9.1 ** Changed in: openlp Status: Confirmed => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1841196 Title: V2892 Service Theme not working Status in OpenLP: Fix Committed Bug description: Windows 10 32 bit Openlp trunk Version 2892 The Theme drop down in the Service plugin appears to do nothingI tried changing the setting between the three possibilities, song/service/global, and nothing changes. To Recreate: 1. in Settings->Theme set Global Theme to 'Blue Burst' 2. Set Theme Level to Song Level 3. select the OK button to exit settings 4. edit a song to have the 'Sea with trees' theme 5. add the same song to the service 6. add another song to the service after verifying it does NOT have a theme associated with the song 7. create a custom slide and use the 'Sea with trees' theme 8. add the custom slide to the Service. 9. set the Theme in the Service to Geo Purple 10. send the Service to the 'Live' screen and watch the themes. Based on the description of the SONG Level setting I would think the song without a theme associated should display with the 'Geo Purple' theme but it displays with the Blue Burst theme. Song Level description: Use the Theme from each song in the database. If a song doesn't have a them associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1841196/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-display-chords into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372072 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/latest-fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/latest-fixes into lp:openlp.
Commit message:
Undo an incorrect change and replace missing code as pert of the display revamp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #1840092 in OpenLP: "version 2889 song edit window 'save and preview'
button only saves"
https://bugs.launchpad.net/openlp/+bug/1840092
Bug #1841196 in OpenLP: "V2892 Service Theme not working"
https://bugs.launchpad.net/openlp/+bug/1841196
For more details, see:
https://code.launchpad.net/~trb143/openlp/latest-fixes/+merge/372057
The save Button did not need renaming it has been moved by QT.
Replace the logic to set the theme for a given item.
Replace the theme regeneration code which was removed in the refactor.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-08-06 20:46:41 +
+++ openlp/core/display/render.py 2019-08-30 12:09:41 +
@@ -503,6 +503,26 @@
self.force_page = False
return None
+def get_theme(self, item):
+"""
+:param item: The :class:`~openlp.core.lib.serviceitem.ServiceItem` item object
+:return string: The name of the theme to be used
+
+"""
+# Just assume we use the global theme.
+theme_name = Registry().get('theme_manager').global_theme
+# The theme level is either set to Service or Item. Use the service theme if one is set. We also have to use the
+# service theme, even when the theme level is set to Item, because the item does not necessarily have to have a
+# theme.
+if self.theme_level != ThemeLevel.Global:
+# When the theme level is at Service and we actually have a service theme then use it.
+if self.theme_level == ThemeLevel.Service:
+theme_name = Registry().get('service_manager').service_theme
+# If we have Item level and have an item theme then use it.
+if self.theme_level == ThemeLevel.Song and item.theme:
+theme_name = item.theme
+return theme_name
+
def format_slide(self, text, item):
"""
Calculate how much text can fit on a slide.
@@ -515,7 +535,7 @@
QtWidgets.QApplication.instance().processEvents()
self.log_debug('format slide')
if item:
-theme_name = item.theme if item.theme else Registry().get('theme_manager').global_theme
+theme_name = self.get_theme(item)
theme_data = Registry().get('theme_manager').get_theme_data(theme_name)
self.theme_height = theme_data.font_main_height
# Set theme for preview
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2019-05-24 22:11:11 +
+++ openlp/core/lib/serviceitem.py 2019-08-30 12:09:41 +
@@ -321,6 +321,13 @@
'display_title': slide['display_title'], 'notes': slide['notes']})
return {'header': service_header, 'data': service_data}
+def render_text_items(self):
+"""
+This method forces the display to be regenerated
+"""
+self._display_slides = []
+self._rendered_slides = []
+
def set_from_service(self, service_item, path=None):
"""
This method takes a service item from a saved service file (passed from the ServiceManager) and extracts the
@@ -503,7 +510,6 @@
:param row: The service item slide to be returned
"""
if self.service_item_type == ServiceItemType.Text:
-# return self.display_frames[row]['html'].split('\n')[0]
return self.rendered_slides[row]['text']
elif self.service_item_type == ServiceItemType.Image:
return self.slides[row]['path']
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/mainwindow.py 2019-08-30 12:09:41 +
@@ -546,7 +546,8 @@
Wait for the threads
"""
# Sometimes the threads haven't finished, let's wait for them
-wait_dialog = QtWidgets.QProgressDialog('Waiting for some things to finish...', '', 0, 0, self)
+wait_dialog = QtWidgets.QProgressDialog(translate('OpenLP.MainWindow', 'Waiting for some things to finish...'),
+'', 0, 0, self)
wait_dialog.setWindowModality(QtCore.Qt.WindowModal)
wait_dialog.setAutoClose(False)
wait_dialog.setCancelButton(None)
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/servicemanager.py 2019-08-30 12:09:41 +
@@ -46,7 +46,7 @@
from openlp.core.lib import build_icon
from
[Openlp-core] [Merge] lp:~trb143/openlp/latest-fixes into lp:openlp
The proposal to merge lp:~trb143/openlp/latest-fixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/latest-fixes/+merge/372055 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/latest-fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/latest-fixes into lp:openlp.
Commit message:
Undo an incorrect change and replace missing code as pert of the display revamp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #1840092 in OpenLP: "version 2889 song edit window 'save and preview'
button only saves"
https://bugs.launchpad.net/openlp/+bug/1840092
Bug #1841196 in OpenLP: "V2892 Service Theme not working"
https://bugs.launchpad.net/openlp/+bug/1841196
For more details, see:
https://code.launchpad.net/~trb143/openlp/latest-fixes/+merge/372055
The save Button did not need renaming it has been moved by QT.
Replace the logic to set the theme for a given item.
Replace the theme regeneration code which was removed in the refactor.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-08-06 20:46:41 +
+++ openlp/core/display/render.py 2019-08-30 11:30:07 +
@@ -503,6 +503,26 @@
self.force_page = False
return None
+def get_theme(self, item):
+"""
+:param item: The :class:`~openlp.core.lib.serviceitem.ServiceItem` item object
+:return string: The name of the theme to be used
+
+"""
+# Just assume we use the global theme.
+theme_name = Registry().get('theme_manager').global_theme
+# The theme level is either set to Service or Item. Use the service theme if one is set. We also have to use the
+# service theme, even when the theme level is set to Item, because the item does not necessarily have to have a
+# theme.
+if self.theme_level != ThemeLevel.Global:
+# When the theme level is at Service and we actually have a service theme then use it.
+if self.theme_level == ThemeLevel.Service:
+theme_name = Registry().get('service_manager').service_theme
+# If we have Item level and have an item theme then use it.
+if self.theme_level == ThemeLevel.Song and item.theme:
+theme_name = item.theme
+return theme_name
+
def format_slide(self, text, item):
"""
Calculate how much text can fit on a slide.
@@ -515,7 +535,7 @@
QtWidgets.QApplication.instance().processEvents()
self.log_debug('format slide')
if item:
-theme_name = item.theme if item.theme else Registry().get('theme_manager').global_theme
+theme_name = self.get_theme(item)
theme_data = Registry().get('theme_manager').get_theme_data(theme_name)
self.theme_height = theme_data.font_main_height
# Set theme for preview
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2019-05-24 22:11:11 +
+++ openlp/core/lib/serviceitem.py 2019-08-30 11:30:07 +
@@ -321,6 +321,13 @@
'display_title': slide['display_title'], 'notes': slide['notes']})
return {'header': service_header, 'data': service_data}
+def render_text_items(self):
+"""
+This method forces the display to be regenerated
+"""
+self._display_slides = []
+self._rendered_slides = []
+
def set_from_service(self, service_item, path=None):
"""
This method takes a service item from a saved service file (passed from the ServiceManager) and extracts the
@@ -503,7 +510,6 @@
:param row: The service item slide to be returned
"""
if self.service_item_type == ServiceItemType.Text:
-# return self.display_frames[row]['html'].split('\n')[0]
return self.rendered_slides[row]['text']
elif self.service_item_type == ServiceItemType.Image:
return self.slides[row]['path']
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/mainwindow.py 2019-08-30 11:30:07 +
@@ -546,7 +546,8 @@
Wait for the threads
"""
# Sometimes the threads haven't finished, let's wait for them
-wait_dialog = QtWidgets.QProgressDialog('Waiting for some things to finish...', '', 0, 0, self)
+wait_dialog = QtWidgets.QProgressDialog(translate('OpenLP.MainWindow', 'Waiting for some things to finish...'),
+'', 0, 0, self)
wait_dialog.setWindowModality(QtCore.Qt.WindowModal)
wait_dialog.setAutoClose(False)
wait_dialog.setCancelButton(None)
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/servicemanager.py 2019-08-30 11:30:07 +
@@ -46,7 +46,7 @@
from openlp.core.lib import build_icon
from
[Openlp-core] [Merge] lp:~trb143/openlp/latest-fixes into lp:openlp
The proposal to merge lp:~trb143/openlp/latest-fixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/latest-fixes/+merge/371774 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/371954 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Review: Approve Again -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371894 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/pymysql into lp:openlp
Review: Approve Approved -- https://code.launchpad.net/~raoul-snyman/openlp/pymysql/+merge/371851 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/pymysql into lp:openlp
Approved -- https://code.launchpad.net/~raoul-snyman/openlp/pymysql/+merge/371851 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pymysql into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Approved -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371882 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1841375] [NEW] On Change of items with a different them the Background image does not change
Public bug reported: Using Song level theme setting. Add two items to the service each with a different theme. When they are displayed the themes changed correctly EXCEPT the background image does not change. This does work fine for gradients. ** Affects: openlp Importance: Critical Status: Confirmed ** Changed in: openlp Importance: Undecided => Critical ** Changed in: openlp Status: New => Confirmed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1841375 Title: On Change of items with a different them the Background image does not change Status in OpenLP: Confirmed Bug description: Using Song level theme setting. Add two items to the service each with a different theme. When they are displayed the themes changed correctly EXCEPT the background image does not change. This does work fine for gradients. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1841375/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/latest-fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/latest-fixes into lp:openlp.
Commit message:
Undo an incorrect change and replace missing code as pert of the display revamp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1840092 in OpenLP: "version 2889 song edit window 'save and preview'
button only saves"
https://bugs.launchpad.net/openlp/+bug/1840092
Bug #1841196 in OpenLP: "V2892 Service Theme not working"
https://bugs.launchpad.net/openlp/+bug/1841196
For more details, see:
https://code.launchpad.net/~trb143/openlp/latest-fixes/+merge/371774
The save Button did not need renaming it has been moved by QT.
Replace the logic to set the theme for a given item.
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/latest-fixes into lp:openlp.
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-08-06 20:46:41 +
+++ openlp/core/display/render.py 2019-08-25 16:15:40 +
@@ -503,6 +503,26 @@
self.force_page = False
return None
+def get_theme(self, item):
+"""
+:param item: The :class:`~openlp.core.lib.serviceitem.ServiceItem` item object
+:return string: The name of the theme to be used
+
+"""
+# Just assume we use the global theme.
+theme_name = Registry().get('theme_manager').global_theme
+# The theme level is either set to Service or Item. Use the service theme if one is set. We also have to use the
+# service theme, even when the theme level is set to Item, because the item does not necessarily have to have a
+# theme.
+if self.theme_level != ThemeLevel.Global:
+# When the theme level is at Service and we actually have a service theme then use it.
+if self.theme_level != ThemeLevel.Service:
+theme_name = Registry().get('service_manager').service_theme
+# If we have Item level and have an item theme then use it.
+if self.theme_level == ThemeLevel.Song and item.theme:
+theme_name = item.theme
+return theme_name
+
def format_slide(self, text, item):
"""
Calculate how much text can fit on a slide.
@@ -515,7 +535,7 @@
QtWidgets.QApplication.instance().processEvents()
self.log_debug('format slide')
if item:
-theme_name = item.theme if item.theme else Registry().get('theme_manager').global_theme
+theme_name = self.get_theme(item)
theme_data = Registry().get('theme_manager').get_theme_data(theme_name)
self.theme_height = theme_data.font_main_height
# Set theme for preview
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/mainwindow.py 2019-08-25 16:15:40 +
@@ -546,7 +546,8 @@
Wait for the threads
"""
# Sometimes the threads haven't finished, let's wait for them
-wait_dialog = QtWidgets.QProgressDialog('Waiting for some things to finish...', '', 0, 0, self)
+wait_dialog = QtWidgets.QProgressDialog(translate('OpenLP.MainWindow', 'Waiting for some things to finish...'),
+'', 0, 0, self)
wait_dialog.setWindowModality(QtCore.Qt.WindowModal)
wait_dialog.setAutoClose(False)
wait_dialog.setCancelButton(None)
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2019-08-04 13:13:33 +
+++ openlp/core/ui/servicemanager.py 2019-08-25 16:15:40 +
@@ -1617,8 +1617,6 @@
theme_group.addAction(create_widget_action(self.theme_menu, theme, text=theme, checked=False,
triggers=self.on_theme_change_action))
find_and_set_in_combo_box(self.theme_combo_box, self.service_theme)
-# TODO: Sort this out
-# self.renderer.set_service_theme(self.service_theme)
self.regenerate_service_items()
def on_theme_change_action(self):
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2019-07-31 20:12:11 +
+++ openlp/plugins/songs/forms/editsongdialog.py 2019-08-25 16:15:40 +
@@ -291,7 +291,6 @@
self.warning_label.setObjectName('warning_label')
self.bottom_layout.addWidget(self.warning_label)
self.button_box = create_button_box(edit_song_dialog, 'button_box', ['cancel', 'save'])
-self.save_button = self.button_box.button(QtWidgets.QDialogButtonBox.Save)
self.bottom_layout.addWidget(self.button_box)
self.dialog_layout.addLayout(self.bottom_layout)
self.retranslate_ui(edit_song_dialog)
@@ -342,7 +341,6 @@
translate('SongsPlugin.EditSongForm', 'Warning: Not all of the verses are in
[Openlp-core] [Bug 1841196] Re: V2892 Service Theme not working
** Changed in: openlp Status: New => Confirmed ** Changed in: openlp Importance: Undecided => Medium ** Changed in: openlp Assignee: (unassigned) => Tim Bentley (trb143) ** Branch linked: lp:~trb143/openlp/latest-fixes -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1841196 Title: V2892 Service Theme not working Status in OpenLP: Confirmed Bug description: Windows 10 32 bit Openlp trunk Version 2892 The Theme drop down in the Service plugin appears to do nothingI tried changing the setting between the three possibilities, song/service/global, and nothing changes. To Recreate: 1. in Settings->Theme set Global Theme to 'Blue Burst' 2. Set Theme Level to Song Level 3. select the OK button to exit settings 4. edit a song to have the 'Sea with trees' theme 5. add the same song to the service 6. add another song to the service after verifying it does NOT have a theme associated with the song 7. create a custom slide and use the 'Sea with trees' theme 8. add the custom slide to the Service. 9. set the Theme in the Service to Geo Purple 10. send the Service to the 'Live' screen and watch the themes. Based on the description of the SONG Level setting I would think the song without a theme associated should display with the 'Geo Purple' theme but it displays with the Blue Burst theme. Song Level description: Use the Theme from each song in the database. If a song doesn't have a them associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1841196/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1840092] Re: version 2889 song edit window 'save and preview' button only saves
Incorrect Fix applied earlier. Not Save has moved from the right to left side of Cancel since 2.4. This is a QT thing. The correct behavior is this: >From Song plugin you get Save and that saves and exits. >From Service Manager you get Save and that Saves and Exits >From Preview you get Save and "Save & Preview". Save saves and exits. "Save and Preview" saves the song and reloads the preview. ** Changed in: openlp Status: New => In Progress ** Changed in: openlp Assignee: (unassigned) => Tim Bentley (trb143) ** Changed in: openlp Importance: Undecided => High ** Branch linked: lp:~trb143/openlp/latest-fixes -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1840092 Title: version 2889 song edit window 'save and preview' button only saves Status in OpenLP: In Progress Bug description: Windown 10 32 bit Version 2889 of Trunk To recreate this; 1. select a song in the song plugin 2. select the edit button in the song library 3. modify a verse 4. select the 'save and preview' button 5. the edit window will close, but the preview never happens. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1840092/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1514894] Re: Simplify theme levels
** Changed in: openlp Assignee: Azaziah (suutari-olli) => (unassigned) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1514894 Title: Simplify theme levels Status in OpenLP: New Bug description: At the moment OpenLP uses 3 theme levels. Song Level = Songs, Bibles and custom slides use their own themes. Service Level = Everything uses service theme Global Level = Everything uses global theme If service Level is active, changing the Global theme has no effect and vice versa, yet they are both visible in the UI at the same time. Using Service/Global Level requires user to change their settings. I think it would be much simpler to just combine the Service and Global theme level into one and call it “Default Level” and control it from both, service and Theme manager. Service theme name is saved into service files, this means the service file will change the service theme on target system. However, this only works if the target system has a theme with the exact same name. I think this highly confusing and service files should not mess around with other machines Theme settings since every computer has their own setups/font sizes/projectors. Alternatively, if we want to keep this, we probably should add a setting for controlling this behauviour (disabled by default) and try to export the theme upon saving the the Service. (if possible) To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1514894/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832955] Re: v2880 groups act strange in service
** Changed in: openlp Status: New => Won't Fix -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832955 Title: v2880 groups act strange in service Status in OpenLP: Won't Fix Bug description: Windows 10 32 bit Trunk Version 2880 startup command python run_openlp.py Load 3 images without a group into images Load 3 more images with a group into images add the first 3 images to the service one at a time add the group of images to the service below the first three images double click the first image in the service Use the keyboard to move through the images When you get to the group of images, pay attention to the live view, the live preview in the main window and the order of the images in the group. When you transition from the single images to the group of images, the last image in the group is displayed. if you move down one more image (using the keyboard) the middle image in the group is displayedif you "go back" one image you will now see the first image in the group. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832955/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371681 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/transfixes into lp:openlp
The proposal to merge lp:~trb143/openlp/transfixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/transfixes/+merge/371426 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/transfixes into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1839726] Re: Version 2889 Blank Error window when closing application
switch on debugging and upload the log file. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1839726 Title: Version 2889 Blank Error window when closing application Status in OpenLP: New Bug description: Windows 10 32 bit OpenLP revision 2889 Clean install with no previous settings or data When closing the application a Blank window flashes to the screen. The window is titled "Error Occurred". The window closes as the application finishes closing. The error log is blank. Is there a way to only show this when there is an error? To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1839726/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832939] Re: Need to select a display when first run of app
Live display was removed as the default due to major issues on machines with one display. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832939 Title: Need to select a display when first run of app Status in OpenLP: New Bug description: Windows 10 32 bit Revision 2880 of trunk run command: Python run_openlp.py The display is not initialized until you go into settings and select the display then reboot. There is an error that comes up that says something to the affect that the Live Display is disabled because there is no display. Once you go into settings and choose the display and reboot the error is no longer displayed on startup. If you are on a single display PC the logo screen appears and you will have to close the program by keystrokes as you can not get back to the app. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832939/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/fixes-IV into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/fixes-IV/+merge/371023 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1837294] Re: Alpha Test - Screen settings are not converted
** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1837294 Title: Alpha Test - Screen settings are not converted Status in OpenLP: Fix Committed Bug description: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had a single screen with a live display and override position. The conversion has ignored all my overrides and not set me up with any displays. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1837294/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/alpha_fixes into lp:openlp.
Commit message:
Fixes all over the place.
* Migration from 2.4 to trunk now handles the screen definitions
* Custom generation from service manager works again
* Print service works
* Open last service works again.
Requested reviews:
Phill (phill-ridout)
Related bugs:
Bug #1837294 in OpenLP: "Alpha Test - Screen settings are not converted"
https://bugs.launchpad.net/openlp/+bug/1837294
For more details, see:
https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370938
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-21 20:53:42 +
+++ openlp/core/common/settings.py 2019-08-04 15:58:13 +
@@ -90,12 +90,13 @@
number: {
'number': number,
geometry_key: {
-'x': x_position,
-'y': y_position,
-'height': height,
-'width': width
+'x': int(x_position),
+'y': int(y_position),
+'height': int(height),
+'width': int(width)
},
-'is_display': is_display_screen
+'is_display': is_display_screen,
+'is_primary': can_override
}
}
@@ -309,7 +310,7 @@
('songuasge/db hostname', 'songusage/db hostname', []),
('songuasge/db database', 'songusage/db database', []),
('presentations / Powerpoint Viewer', '', []),
-(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override',
+(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override position',
'core/display on monitor'], 'core/screens', [(upgrade_screens, [1, 0, 0, None, None, False, False])]),
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-06-09 20:22:43 +
+++ openlp/core/display/render.py 2019-08-04 15:58:13 +
@@ -482,6 +482,7 @@
:param theme_data: The theme to generated a preview for.
:param force_page: Flag to tell message lines per page need to be generated.
+:param generate_screenshot: Do I need to generate a screen shot?
:rtype: QtGui.QPixmap
"""
# save value for use in format_slide
=== modified file 'openlp/core/display/screens.py'
--- openlp/core/display/screens.py 2019-04-13 13:00:22 +
+++ openlp/core/display/screens.py 2019-08-04 15:58:13 +
@@ -133,8 +133,13 @@
self.number = int(screen_dict['number'])
self.is_display = screen_dict['is_display']
self.is_primary = screen_dict['is_primary']
-self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
- screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+try:
+self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
+ screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+except KeyError:
+# Preserve the current values as this has come from the settings update which does not have
+# the geometry information
+pass
if 'custom_geometry' in screen_dict:
self.custom_geometry = QtCore.QRect(screen_dict['custom_geometry']['x'],
screen_dict['custom_geometry']['y'],
=== modified file 'openlp/core/threading.py'
--- openlp/core/threading.py 2019-04-13 13:00:22 +
+++ openlp/core/threading.py 2019-08-04 15:58:13 +
@@ -24,10 +24,11 @@
"""
from PyQt5 import QtCore
+from openlp.core.common.mixins import LogMixin
from openlp.core.common.registry import Registry
-class ThreadWorker(QtCore.QObject):
+class ThreadWorker(QtCore.QObject, LogMixin):
"""
The :class:`~openlp.core.threading.ThreadWorker` class provides a base class for all worker objects
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-07-01 22:36:14 +
+++ openlp/core/ui/mainwindow.py 2019-08-04 15:58:13 +
@@ -635,7 +635,10 @@
# if self.live_controller.display.isVisible():
# self.live_controller.display.setFocus()
self.activateWindow()
-if self.application.args:
+# We have -disable-web-security added by our code.
+# If a file is passed in we will have that as well so count of 2
+# If not we need to see if we want to use the previous file.so count of 1
+if self.application.args and len(self.application.
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
The proposal to merge lp:~trb143/openlp/alpha_fixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370937 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/alpha_fixes into lp:openlp.
Commit message:
Fixes all over the place.
* Migration from 2.4 to trunk now handles the screen definitions
* Custom generation from service manager works again
* Print service works
* Open last service works again.
Requested reviews:
Phill (phill-ridout)
Related bugs:
Bug #1837294 in OpenLP: "Alpha Test - Screen settings are not converted"
https://bugs.launchpad.net/openlp/+bug/1837294
For more details, see:
https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370937
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-21 20:53:42 +
+++ openlp/core/common/settings.py 2019-08-04 14:06:37 +
@@ -90,12 +90,13 @@
number: {
'number': number,
geometry_key: {
-'x': x_position,
-'y': y_position,
-'height': height,
-'width': width
+'x': int(x_position),
+'y': int(y_position),
+'height': int(height),
+'width': int(width)
},
-'is_display': is_display_screen
+'is_display': is_display_screen,
+'is_primary': number
}
}
@@ -309,7 +310,7 @@
('songuasge/db hostname', 'songusage/db hostname', []),
('songuasge/db database', 'songusage/db database', []),
('presentations / Powerpoint Viewer', '', []),
-(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override',
+(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override position',
'core/display on monitor'], 'core/screens', [(upgrade_screens, [1, 0, 0, None, None, False, False])]),
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-06-09 20:22:43 +
+++ openlp/core/display/render.py 2019-08-04 14:06:37 +
@@ -482,6 +482,7 @@
:param theme_data: The theme to generated a preview for.
:param force_page: Flag to tell message lines per page need to be generated.
+:param generate_screenshot: Do I need to generate a screen shot?
:rtype: QtGui.QPixmap
"""
# save value for use in format_slide
=== modified file 'openlp/core/display/screens.py'
--- openlp/core/display/screens.py 2019-04-13 13:00:22 +
+++ openlp/core/display/screens.py 2019-08-04 14:06:37 +
@@ -133,8 +133,13 @@
self.number = int(screen_dict['number'])
self.is_display = screen_dict['is_display']
self.is_primary = screen_dict['is_primary']
-self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
- screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+try:
+self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
+ screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+except KeyError:
+# Preserve the current values as this has come from the settings update which does not have
+# the geometry information
+pass
if 'custom_geometry' in screen_dict:
self.custom_geometry = QtCore.QRect(screen_dict['custom_geometry']['x'],
screen_dict['custom_geometry']['y'],
=== modified file 'openlp/core/threading.py'
--- openlp/core/threading.py 2019-04-13 13:00:22 +
+++ openlp/core/threading.py 2019-08-04 14:06:37 +
@@ -24,10 +24,11 @@
"""
from PyQt5 import QtCore
+from openlp.core.common.mixins import LogMixin
from openlp.core.common.registry import Registry
-class ThreadWorker(QtCore.QObject):
+class ThreadWorker(QtCore.QObject, LogMixin):
"""
The :class:`~openlp.core.threading.ThreadWorker` class provides a base class for all worker objects
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-07-01 22:36:14 +
+++ openlp/core/ui/mainwindow.py 2019-08-04 14:06:37 +
@@ -635,7 +635,10 @@
# if self.live_controller.display.isVisible():
# self.live_controller.display.setFocus()
self.activateWindow()
-if self.application.args:
+# We have -disable-web-security added by our code.
+# If a file is passed in we will have that as well so count of 2
+# If not we need to see if we want to use the previous file.so count of 1
+if self.application.args and len(self.application.
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
The proposal to merge lp:~trb143/openlp/alpha_fixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370936 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/alpha_fixes into lp:openlp.
Commit message:
Fixes all over the place.
* Migration from 2.4 to trunk now handles the screen definitions
* Custom generation from service manager works again
* Print service works
* Open last service works again.
Requested reviews:
Phill (phill-ridout)
Related bugs:
Bug #1837294 in OpenLP: "Alpha Test - Screen settings are not converted"
https://bugs.launchpad.net/openlp/+bug/1837294
For more details, see:
https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370936
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-21 20:53:42 +
+++ openlp/core/common/settings.py 2019-08-04 13:17:02 +
@@ -90,12 +90,13 @@
number: {
'number': number,
geometry_key: {
-'x': x_position,
-'y': y_position,
-'height': height,
-'width': width
+'x': int(x_position),
+'y': int(y_position),
+'height': int(height),
+'width': int(width)
},
-'is_display': is_display_screen
+'is_display': is_display_screen,
+'is_primary': number
}
}
@@ -309,7 +310,7 @@
('songuasge/db hostname', 'songusage/db hostname', []),
('songuasge/db database', 'songusage/db database', []),
('presentations / Powerpoint Viewer', '', []),
-(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override',
+(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override position',
'core/display on monitor'], 'core/screens', [(upgrade_screens, [1, 0, 0, None, None, False, False])]),
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-06-09 20:22:43 +
+++ openlp/core/display/render.py 2019-08-04 13:17:02 +
@@ -482,6 +482,7 @@
:param theme_data: The theme to generated a preview for.
:param force_page: Flag to tell message lines per page need to be generated.
+:param generate_screenshot: Do I need to generate a screen shot?
:rtype: QtGui.QPixmap
"""
# save value for use in format_slide
=== modified file 'openlp/core/display/screens.py'
--- openlp/core/display/screens.py 2019-04-13 13:00:22 +
+++ openlp/core/display/screens.py 2019-08-04 13:17:02 +
@@ -133,8 +133,13 @@
self.number = int(screen_dict['number'])
self.is_display = screen_dict['is_display']
self.is_primary = screen_dict['is_primary']
-self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
- screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+try:
+self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
+ screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+except:
+# Preserve the current values as this has come from the settings update which does not have
+# the geometry information
+pass
if 'custom_geometry' in screen_dict:
self.custom_geometry = QtCore.QRect(screen_dict['custom_geometry']['x'],
screen_dict['custom_geometry']['y'],
=== modified file 'openlp/core/threading.py'
--- openlp/core/threading.py 2019-04-13 13:00:22 +
+++ openlp/core/threading.py 2019-08-04 13:17:02 +
@@ -24,10 +24,11 @@
"""
from PyQt5 import QtCore
+from openlp.core.common.mixins import LogMixin
from openlp.core.common.registry import Registry
-class ThreadWorker(QtCore.QObject):
+class ThreadWorker(QtCore.QObject, LogMixin):
"""
The :class:`~openlp.core.threading.ThreadWorker` class provides a base class for all worker objects
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-07-01 22:36:14 +
+++ openlp/core/ui/mainwindow.py 2019-08-04 13:17:02 +
@@ -635,7 +635,10 @@
# if self.live_controller.display.isVisible():
# self.live_controller.display.setFocus()
self.activateWindow()
-if self.application.args:
+# We have -disable-web-security added by our code.
+# If a file is passed in we will have that as well so count of 2
+# If not we need to see if we want to use the previous file.so count of 1
+if self.application.args and len(self.application.args) > 1:
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
The proposal to merge lp:~trb143/openlp/alpha_fixes into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370934 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/alpha_fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/alpha_fixes into lp:openlp.
Commit message:
Fixes all over the place.
* Migration from 2.4 to trunk now handles the screen definitions
* Custom generation from service manager works again
* Print service works
* Open last service works again.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1837294 in OpenLP: "Alpha Test - Screen settings are not converted"
https://bugs.launchpad.net/openlp/+bug/1837294
For more details, see:
https://code.launchpad.net/~trb143/openlp/alpha_fixes/+merge/370934
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/alpha_fixes into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-21 20:53:42 +
+++ openlp/core/common/settings.py 2019-08-04 08:10:26 +
@@ -90,12 +90,13 @@
number: {
'number': number,
geometry_key: {
-'x': x_position,
-'y': y_position,
-'height': height,
-'width': width
+'x': int(x_position),
+'y': int(y_position),
+'height': int(height),
+'width': int(width)
},
-'is_display': is_display_screen
+'is_display': is_display_screen,
+'is_primary': number
}
}
@@ -309,7 +310,7 @@
('songuasge/db hostname', 'songusage/db hostname', []),
('songuasge/db database', 'songusage/db database', []),
('presentations / Powerpoint Viewer', '', []),
-(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override',
+(['core/monitor', 'core/x position', 'core/y position', 'core/height', 'core/width', 'core/override position',
'core/display on monitor'], 'core/screens', [(upgrade_screens, [1, 0, 0, None, None, False, False])]),
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py 2019-06-09 20:22:43 +
+++ openlp/core/display/render.py 2019-08-04 08:10:26 +
@@ -482,6 +482,7 @@
:param theme_data: The theme to generated a preview for.
:param force_page: Flag to tell message lines per page need to be generated.
+:param generate_screenshot: Do I need to generate a screen shot?
:rtype: QtGui.QPixmap
"""
# save value for use in format_slide
=== modified file 'openlp/core/display/screens.py'
--- openlp/core/display/screens.py 2019-04-13 13:00:22 +
+++ openlp/core/display/screens.py 2019-08-04 08:10:26 +
@@ -133,8 +133,13 @@
self.number = int(screen_dict['number'])
self.is_display = screen_dict['is_display']
self.is_primary = screen_dict['is_primary']
-self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
- screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+try:
+self.geometry = QtCore.QRect(screen_dict['geometry']['x'], screen_dict['geometry']['y'],
+ screen_dict['geometry']['width'], screen_dict['geometry']['height'])
+except:
+# Preserve the current values as this has come from the settings update which does not have
+# the geometry information
+pass
if 'custom_geometry' in screen_dict:
self.custom_geometry = QtCore.QRect(screen_dict['custom_geometry']['x'],
screen_dict['custom_geometry']['y'],
=== modified file 'openlp/core/threading.py'
--- openlp/core/threading.py 2019-04-13 13:00:22 +
+++ openlp/core/threading.py 2019-08-04 08:10:26 +
@@ -24,10 +24,11 @@
"""
from PyQt5 import QtCore
+from openlp.core.common.mixins import LogMixin
from openlp.core.common.registry import Registry
-class ThreadWorker(QtCore.QObject):
+class ThreadWorker(QtCore.QObject, LogMixin):
"""
The :class:`~openlp.core.threading.ThreadWorker` class provides a base class for all worker objects
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-07-01 22:36:14 +
+++ openlp/core/ui/mainwindow.py 2019-08-04 08:10:26 +
@@ -635,7 +635,8 @@
# if self.live_controller.display.isVisible():
# self.live_controller.display.setFocus()
self.activateWindow()
-if self.application.args:
+# We will always have 1 but more need to be processed
+if self.application.args and len(self.application.args) > 1:
self.open_cmd_line_files(self.application.args)
[Openlp-core] [Bug 1837294] Re: Alpha Test - Screen settings are not converted
** Branch linked: lp:~trb143/openlp/alpha_fixes -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1837294 Title: Alpha Test - Screen settings are not converted Status in OpenLP: In Progress Bug description: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had a single screen with a live display and override position. The conversion has ignored all my overrides and not set me up with any displays. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1837294/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1837294] Re: Alpha Test - Screen settings are not converted
** Changed in: openlp Status: New => In Progress ** Changed in: openlp Importance: Undecided => Critical ** Changed in: openlp Assignee: (unassigned) => Tim Bentley (trb143) ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1837294 Title: Alpha Test - Screen settings are not converted Status in OpenLP: In Progress Bug description: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had a single screen with a live display and override position. The conversion has ignored all my overrides and not set me up with any displays. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1837294/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1095742] Re: Portable apps storing drive letter in db
** Changed in: openlp/trunk Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1095742 Title: Portable apps storing drive letter in db Status in OpenLP: Fix Committed Status in OpenLP 2.0 series: Won't Fix Status in OpenLP trunk series: Fix Committed Bug description: From Bob Donkin http://forums.openlp.org/discussion/2014/portable-app-assigning-drive-letter-in-sqlite-database I am using the portable app version of openlp. I have linked many songs to audio files(mp3). The problem I have is the sqlite database has given an absolute address for the audio file eg: F:\PortableApps\OpenLPPortable\Data\songs\audio\205\09-I cannot tell.mp3 . However when I plug in the USB stick at Church the computer assigns it the drive letter E: so none of the audio works. Would it be possible on the next release to use a relative address eg: songs\audio\205\09-I cannot tell.mp3 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1095742/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1608024] Re: DVD Media Time Stamps Not Working
** Changed in: openlp Assignee: (unassigned) => Tim Bentley (trb143) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1608024 Title: DVD Media Time Stamps Not Working Status in OpenLP: New Bug description: Windows 7 Professional and Windows 10 Professional OpenLP 2.4.2 VLC media player 2.2.4 Click the DVD icon to add a DVD video then start playing the video the timer does not show the time of the video. The endpoint is not set when video is loaded and clicking the set start time or end time do not work as the video main timer does not work. Start times and end times can be set manually and work fine but without a preview video timer its hard to know what times to set. Note that tested with OpenLP 2.2 and it works fine on these systems and will even carry the video time over and play properly after upgrading to 2.4.2 but no new video clips added in 2.4.2 will work due to above issue. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1608024/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1837294] [NEW] Alpha Test - Screen settings are not converted
Public bug reported: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had a single screen with a live display and override position. The conversion has ignored all my overrides and not set me up with any displays. ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1837294 Title: Alpha Test - Screen settings are not converted Status in OpenLP: New Bug description: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had a single screen with a live display and override position. The conversion has ignored all my overrides and not set me up with any displays. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1837294/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1837293] [NEW] Alpha Test - Update breaks themes
Public bug reported: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had 3 default themes and 1 new theme. 2 themes are missing. the transparent theme still exists. One of the downloaded themes (Sunrise) is corrupted. Playing as song takes the old default theme which is missing from the theme manager. ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1837293 Title: Alpha Test - Update breaks themes Status in OpenLP: New Bug description: One a Brand laptop with Fedora installed 2.4.6 build I have then run trunk (20-07-2019). I had 3 default themes and 1 new theme. 2 themes are missing. the transparent theme still exists. One of the downloaded themes (Sunrise) is corrupted. Playing as song takes the old default theme which is missing from the theme manager. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1837293/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/fixes-III into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/fixes-III/+merge/370337 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/fixes-III into lp:openlp
Review: Needs Information
See inline comments
Diff comments:
>
> === modified file 'openlp/core/common/i18n.py'
> --- openlp/core/common/i18n.py2019-06-28 18:09:25 +
> +++ openlp/core/common/i18n.py2019-07-18 19:27:49 +
> @@ -338,8 +338,8 @@
> Override the default object creation method to return a single
> instance.
> """
> if not cls.__instance__:
> -cls.__instance__ = object.__new__(cls)
> -cls.load(cls)
> +cls.__instance__ = super().__new__(cls)
> +cls.__instance__.load()
This was changed to improve performance as it was doing a full initialisation
each time it was run.
put a print statement at the top of load and check how many times it comes out.
Also in icons as well
> return cls.__instance__
>
> def load(self):
>
> === modified file 'openlp/core/ui/icons.py'
> --- openlp/core/ui/icons.py 2019-04-13 13:00:22 +
> +++ openlp/core/ui/icons.py 2019-07-18 19:27:49 +
> @@ -45,8 +45,8 @@
> Override the default object creation method to return a single
> instance.
> """
> if not cls.__instance__:
> -cls.__instance__ = object.__new__(cls)
> -cls.load(cls)
> +cls.__instance__ = super().__new__(cls)
> +cls.__instance__.load()
> return cls.__instance__
See above
>
> def load(self):
>
> === modified file 'openlp/core/widgets/views.py'
> --- openlp/core/widgets/views.py 2019-05-23 19:33:46 +
> +++ openlp/core/widgets/views.py 2019-07-18 19:27:49 +
> @@ -219,7 +219,7 @@
> slide_height = width // self.screen_ratio
> max_img_row_height = Settings().value('advanced/slide max
> height')
> if isinstance(max_img_row_height, int):
> -if max_img_row_height > 0 and slide_height >
> max_img_row_height:
> +if 0 < max_img_row_height < slide_height:
Please check this as we have had this type of structure before and it did not
work!
> slide_height = max_img_row_height
> elif max_img_row_height < 0:
> # If auto setting, show that number of slides, or if
> the resulting slides too small, 100px.
--
https://code.launchpad.net/~phill-ridout/openlp/fixes-III/+merge/370337
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/wow_import_fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/wow_import_fixes/+merge/369468 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/wow_import_fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/wow_import_fixes/+merge/369463 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832876] Re: Please add songbook to the 'Delete Duplicate Songs' Wizard
** Changed in: openlp Assignee: (unassigned) => Johnthan (johnmfl) ** Changed in: openlp Milestone: None => 2.9.1 ** Changed in: openlp Status: New => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832876 Title: Please add songbook to the 'Delete Duplicate Songs' Wizard Status in OpenLP: Fix Committed Bug description: Windows 10 OpenLP 2.4.6 When trying to delete duplicate songs using the wizard, please add the songbook and theme to the information displayed. It helps to know that there are three duplicates of a song, but each is in a different songbook or that they have different themes. Most musicians add bits to the song that make them special for just them! To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832876/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832874] Re: Temporary songs appear in the 'Delete Duplicate songs' wizard
** Changed in: openlp Status: Confirmed => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 ** Changed in: openlp Assignee: (unassigned) => Johnthan (johnmfl) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832874 Title: Temporary songs appear in the 'Delete Duplicate songs' wizard Status in OpenLP: Fix Committed Bug description: Windows 10 OpenLP 2.4.6 When you run the Delete Duplicate songs wizard most songs marked in the db as Temporary will show up and the user has no idea that they are temporary It would be best if the songs were removed from the db when they are no longer needed, but at the very least they should not show up in the wizard. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832874/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~johnmfl/openlp/delete_temp_songs_add_fields_dupsongreview into lp:openlp
The proposal to merge lp:~johnmfl/openlp/delete_temp_songs_add_fields_dupsongreview into lp:openlp has been updated. Commit message changed to: #1832874 changed songsplugin.py from `is true` to `== True` to force the deletion of temporary song records in the database on closing OpenLP. This may not be proper python, but the database appears to need the `== True` to function correctly. #1832876 Change songreviewwidget.py to add the `last modified` date and the `theme` used by the song. The bug lists 3 fields that would help determine what song to delete...the user only wanted the last modified date. I added the theme and songbook name, but the songbook name was not added in this update...If I am the only person that wants the songbook name it isn't worth the time to add. For more details, see: https://code.launchpad.net/~johnmfl/openlp/delete_temp_songs_add_fields_dupsongreview/+merge/369062 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~johnmfl/openlp/delete_temp_songs_add_fields_dupsongreview into lp:openlp
Review: Approve -- https://code.launchpad.net/~johnmfl/openlp/delete_temp_songs_add_fields_dupsongreview/+merge/369062 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 19:30:51 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 19:30:51 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 19:30:51 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 19:30:51 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = servi
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 19:28:31 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 19:28:31 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 19:28:31 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 19:28:31 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = servi
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 18:00:17 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 18:00:17 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 18:00:17 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 18:00:17 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = servi
[Openlp-core] [Bug 1832874] Re: Temporary songs appear in the 'Delete Duplicate songs' wizard
Code to fix this was removed from the Songs plugin in 2.2 but was there in 2.0 ** Changed in: openlp Status: New => Confirmed ** Changed in: openlp Importance: Undecided => High -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832874 Title: Temporary songs appear in the 'Delete Duplicate songs' wizard Status in OpenLP: Confirmed Bug description: Windows 10 OpenLP 2.4.6 When you run the Delete Duplicate songs wizard most songs marked in the db as Temporary will show up and the user has no idea that they are temporary It would be best if the songs were removed from the db when they are no longer needed, but at the very least they should not show up in the wizard. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832874/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/fixes-201906-a into lp:openlp
Review: Approve Approved -- https://code.launchpad.net/~tomasgroth/openlp/fixes-201906-a/+merge/368677 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/fix-theme-thumb into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/fix-theme-thumb/+merge/368596 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/fix-theme-thumb into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/fix-theme-thumb/+merge/368571 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/pyro-impress into lp:openlp
Review: Approve Looks fine but no Mac so no idea if it runs! -- https://code.launchpad.net/~raoul-snyman/openlp/pyro-impress/+merge/368362 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/media_ext_refactors into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/media_ext_refactors/+merge/368221 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/media_ext_refactors into lp:openlp
Review: Needs Fixing
Minor improvement please
Diff comments:
>
> === modified file 'openlp/core/ui/media/mediacontroller.py'
> --- openlp/core/ui/media/mediacontroller.py 2019-05-05 05:59:29 +
> +++ openlp/core/ui/media/mediacontroller.py 2019-05-31 20:34:31 +
> @@ -131,7 +106,8 @@
> else:
> State().missing_text('media_live',
> translate('OpenLP.SlideController',
> 'VLC or pymediainfo are missing, so you are
> unable to play any media'))
> -self._generate_extensions_lists()
> +self.service_manager.supported_suffixes(AUDIO_EXT)
Would be better to pull not push the fields. Can you move to ServiceManager
> +self.service_manager.supported_suffixes(VIDEO_EXT)
> return True
>
> def bootstrap_post_set_up(self):
--
https://code.launchpad.net/~phill-ridout/openlp/media_ext_refactors/+merge/368212
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/dependencies into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/dependencies/+merge/367931 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/presentation-beyond-last into lp:openlp
Review: Approve Looks Ok. -- https://code.launchpad.net/~tomasgroth/openlp/presentation-beyond-last/+merge/367932 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/bundle-libvlc into lp:openlp
Review: Approve Looks good for the bits I understand! -- https://code.launchpad.net/~raoul-snyman/openlp/bundle-libvlc/+merge/367789 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v07 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v07/+merge/367473 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/no_vlc into lp:openlp
The proposal to merge lp:~trb143/openlp/no_vlc into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367110 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/no_vlc into lp:openlp
The proposal to merge lp:~trb143/openlp/no_vlc into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367067 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Media plays successfully and cleanups.
Added VLC additions
Requested reviews:
Tomas Groth (tomasgroth)
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/366957
Media now plays, stops, seeks and repeats.
Media Tab now works but needs more love.
VLC arguments is now added and usable.
Experimental flag added to UI. Set this and it may go bang. You will need to
edit settings manually to release this!
Add code (provided by tgc and superfly) to get media components. Works fine
outside OpenLP but takes out OpenLP on Fedora 30. Activate by using
experimental and restart.
Fixed the imagemanager bug on saving themes. Now works except preview image is
black!
Removed many bits of commented out code.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-04-13 13:00:22 +
+++ openlp/core/common/settings.py 2019-05-05 06:00:56 +
@@ -180,15 +180,13 @@
'api/thumbnails': True,
'crashreport/last directory': None,
'formattingTags/html_tags': '',
-'core/audio repeat list': False,
'core/auto open': False,
'core/auto preview': False,
-'core/audio start paused': True,
'core/auto unblank': False,
'core/click live slide to unblank': False,
'core/blank warning': False,
'core/ccli number': '',
-'core/experimental': False,
+'advanced/experimental': False,
'core/has run wizard': False,
'core/language': '[en]',
'core/last version test': '',
@@ -213,6 +211,7 @@
'images/background color': '#00',
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
+'media/vlc arguments': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
@@ -317,7 +316,9 @@
('bibles/proxy username', '', []),
('bibles/proxy password', '', []),
('media/players', '', []),
-('media/override player', '', [])
+('media/override player', '', []),
+('core/audio start paused', '', []),
+('core/audio repeat list', '', [])
]
@staticmethod
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/__init__.py 2019-05-05 06:00:56 +
@@ -93,4 +93,4 @@
self.resizeRowsToContents()
-__all__ = ['SingleColumnTableWidget']
+__all__ = ['SingleColumnTableWidget', 'DisplayControllerType']
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/advancedtab.py 2019-05-05 06:00:56 +
@@ -117,6 +117,9 @@
self.enable_auto_close_check_box = QtWidgets.QCheckBox(self.ui_group_box)
self.enable_auto_close_check_box.setObjectName('enable_auto_close_check_box')
self.ui_layout.addRow(self.enable_auto_close_check_box)
+self.experimental_check_box = QtWidgets.QCheckBox(self.ui_group_box)
+self.experimental_check_box.setObjectName('experimental_check_box')
+self.ui_layout.addRow(self.experimental_check_box)
self.left_layout.addWidget(self.ui_group_box)
if HAS_DARK_STYLE:
self.use_dark_style_checkbox = QtWidgets.QCheckBox(self.ui_group_box)
@@ -291,6 +294,8 @@
'Auto-scroll the next slide to bottom'))
self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab',
'Enable application exit confirmation'))
+self.experimental_check_box.setText(translate('OpenLP.GeneralTab',
+ 'Experimental features (use at your own risk)'))
if HAS_DARK_STYLE:
self.use_dark_style_checkbox.setText(translate('OpenLP.AdvancedTab', 'Use dark style (needs restart)'))
self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name'))
@@ -360,6 +365,7 @@
if self.autoscroll_map[i] == autoscroll_value and i < self.autoscroll_combo_box.count():
self.autoscroll_combo_box.setCurrentIndex(i)
self.enable_auto_close_check_box.setChecked(settings.value('enable exit confirmation'))
+self.experimental_check_box.setChecked(settings.value('experimental'))
if HAS_DARK_STYLE:
self.use_dark_style_checkbox.setChecked(settings.value('use_dark_style'))
self.hide_mouse_check_box.setChecked(settings.value('hide mouse'))
@@ -423,6 +429,7 @@
slide_max_height_value = self.slide_max_height_combo_box.itemData(slide_max_height_in
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/366608 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2_v04 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2_v04/+merge/366946 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~phill-ridout/openlp/fixes-II into lp:openlp
Review: Needs Information
See inline
Diff comments:
> === modified file 'openlp/core/app.py'
> --- openlp/core/app.py2019-05-01 19:22:01 +
> +++ openlp/core/app.py2019-05-04 18:27:23 +
> @@ -287,12 +287,12 @@
> return QtWidgets.QApplication.event(self, event)
>
>
> -def parse_options(args=None):
Have you tested desktop drag and drop of service files to openlp.exe on the
desktop?
> +def parse_options():
> """
> Parse the command line arguments
>
> -:param args: list of command line arguments
> -:return: a tuple of parsed options of type optparse.Value and a list of
> remaining argsZ
> +:return: An :object:`argparse.Namespace` insatnce containing the parsed
> args.
> +:rtype: argparse.Namespace
> """
> # Set up command line options.
> parser = argparse.ArgumentParser(prog='openlp')
>
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py 2019-04-13 13:00:22 +
> +++ openlp/core/ui/mainwindow.py 2019-05-04 18:27:23 +
> @@ -475,7 +475,6 @@
> super(MainWindow, self).__init__()
> Registry().register('main_window', self)
> self.clipboard = self.application.clipboard()
> -self.arguments = ''.join(self.application.args)
This was for desktop drag and drop.
> # Set up settings sections for the main application (not for use by
> plugins).
> self.ui_settings_section = 'user interface'
> self.general_settings_section = 'core'
--
https://code.launchpad.net/~phill-ridout/openlp/fixes-II/+merge/366951
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/portable-path into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/portable-path/+merge/366785 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/gpl3 into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/366626 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Media plays successfully and cleanups.
Added VLC additions
Requested reviews:
Tomas Groth (tomasgroth)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/366608
Media now plays, stops, seeks and repeats.
Media Tab now works but needs more love.
VLC addtitions is now added and usable.
Experimental flag added to UI. Set this and it may go bang. You will need to
edit settings manually to release this!
Add code (provided by tgc and superfly) to get media components. Works fine
outside OpenLP but takes out OpenLP on Fedora 30. Activate by using
experimental and restart.
Fixed the imagemanager bug on saving themes. Now works except preview image is
black!
Removed many bits of commented out code.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-04-09 17:21:35 +
+++ openlp/core/common/settings.py 2019-04-27 15:20:26 +
@@ -188,7 +188,7 @@
'core/click live slide to unblank': False,
'core/blank warning': False,
'core/ccli number': '',
-'core/experimental': False,
+'advanced/experimental': False,
'core/has run wizard': False,
'core/language': '[en]',
'core/last version test': '',
@@ -213,6 +213,7 @@
'images/background color': '#00',
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
+'media/vlc additions': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/__init__.py 2019-04-27 15:20:26 +
@@ -93,4 +93,4 @@
self.resizeRowsToContents()
-__all__ = ['SingleColumnTableWidget']
+__all__ = ['SingleColumnTableWidget', 'DisplayControllerType']
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2019-03-15 20:56:32 +
+++ openlp/core/ui/advancedtab.py 2019-04-27 15:20:26 +
@@ -117,6 +117,9 @@
self.enable_auto_close_check_box = QtWidgets.QCheckBox(self.ui_group_box)
self.enable_auto_close_check_box.setObjectName('enable_auto_close_check_box')
self.ui_layout.addRow(self.enable_auto_close_check_box)
+self.experimental_check_box = QtWidgets.QCheckBox(self.ui_group_box)
+self.experimental_check_box.setObjectName('experimental_check_box')
+self.ui_layout.addRow(self.experimental_check_box)
self.left_layout.addWidget(self.ui_group_box)
if HAS_DARK_STYLE:
self.use_dark_style_checkbox = QtWidgets.QCheckBox(self.ui_group_box)
@@ -291,6 +294,8 @@
'Auto-scroll the next slide to bottom'))
self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab',
'Enable application exit confirmation'))
+self.experimental_check_box.setText(translate('OpenLP.GeneralTab',
+ 'Experimental features (use at your own risk)'))
if HAS_DARK_STYLE:
self.use_dark_style_checkbox.setText(translate('OpenLP.AdvancedTab', 'Use dark style (needs restart)'))
self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name'))
@@ -360,6 +365,7 @@
if self.autoscroll_map[i] == autoscroll_value and i < self.autoscroll_combo_box.count():
self.autoscroll_combo_box.setCurrentIndex(i)
self.enable_auto_close_check_box.setChecked(settings.value('enable exit confirmation'))
+self.experimental_check_box.setChecked(settings.value('experimental'))
if HAS_DARK_STYLE:
self.use_dark_style_checkbox.setChecked(settings.value('use_dark_style'))
self.hide_mouse_check_box.setChecked(settings.value('hide mouse'))
@@ -423,6 +429,7 @@
slide_max_height_value = self.slide_max_height_combo_box.itemData(slide_max_height_index)
settings.setValue('slide max height', slide_max_height_value)
settings.setValue('autoscrolling', self.autoscroll_map[self.autoscroll_combo_box.currentIndex()])
+settings.setValue('experimental', self.experimental_check_box.isChecked())
settings.setValue('enable exit confirmation', self.enable_auto_close_check_box.isChecked())
settings.setValue('hide mouse', self.hide_mouse_check_box.isChecked())
settings.setValue('alternate rows', self.alternate_rows_check_box.isChecked())
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-04-12 16:37:45 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/366336 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v1 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v1/+merge/366334 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v02 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v02/+merge/366554 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Prints are there as the code just explodes on my machine and shuts OpenLP down. No worth doing anything cute while it is this state! They never get called. Happy to move flag. -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/366336 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Media plays successfully and cleanups.
Added VLC additions
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/366336
Media now plays, stops, seeks and repeats.
Media Tab now works but needs more love.
VLC addtitions is now added and usable.
Experimental flag added to UI. Set this and it may go bang. You will need to
edit settings manually to release this!
Add code (provided by tgc and superfly) to get media components. Works fine
outside OpenLP but takes out OpenLP on Fedora 30. Activate by using
experimental and restart.
Fixed the imagemanager bug on saving themes. Now works except preview image is
black!
Removed many bits of commented out code.
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-04-09 17:21:35 +
+++ openlp/core/common/settings.py 2019-04-21 12:51:38 +
@@ -213,6 +213,7 @@
'images/background color': '#00',
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
+'media/vlc additions': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/__init__.py 2019-04-21 12:51:38 +
@@ -93,4 +93,4 @@
self.resizeRowsToContents()
-__all__ = ['SingleColumnTableWidget']
+__all__ = ['SingleColumnTableWidget', 'DisplayControllerType']
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2019-03-16 10:20:46 +
+++ openlp/core/ui/generaltab.py 2019-04-21 12:51:38 +
@@ -113,6 +113,9 @@
self.check_for_updates_check_box = QtWidgets.QCheckBox(self.startup_group_box)
self.check_for_updates_check_box.setObjectName('check_for_updates_check_box')
self.startup_layout.addWidget(self.check_for_updates_check_box)
+self.experimental_check_box = QtWidgets.QCheckBox(self.startup_group_box)
+self.experimental_check_box.setObjectName('experimental_check_box')
+self.startup_layout.addWidget(self.experimental_check_box)
self.right_layout.addWidget(self.startup_group_box)
# Logo
self.logo_group_box = QtWidgets.QGroupBox(self.right_column)
@@ -180,6 +183,8 @@
self.logo_file_label.setText(translate('OpenLP.GeneralTab', 'Logo file:'))
self.logo_hide_on_startup_check_box.setText(translate('OpenLP.GeneralTab', 'Don\'t show logo on startup'))
self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP'))
+self.experimental_check_box.setText(translate('OpenLP.GeneralTab',
+ 'Experimental features (use at your own risk)'))
self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings'))
self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab',
'Prompt to save before starting a new service'))
@@ -222,6 +227,7 @@
self.logo_hide_on_startup_check_box.setChecked(settings.value('logo hide on startup'))
self.logo_color_button.color = self.logo_background_color
self.check_for_updates_check_box.setChecked(settings.value('update check'))
+self.experimental_check_box.setChecked(settings.value('experimental'))
self.auto_preview_check_box.setChecked(settings.value('auto preview'))
self.timeout_spin_box.setValue(settings.value('loop delay'))
self.start_paused_check_box.setChecked(settings.value('audio start paused'))
@@ -241,6 +247,7 @@
settings.setValue('logo file', self.logo_file_path_edit.path)
settings.setValue('logo hide on startup', self.logo_hide_on_startup_check_box.isChecked())
settings.setValue('update check', self.check_for_updates_check_box.isChecked())
+settings.setValue('experimental', self.experimental_check_box.isChecked())
settings.setValue('save prompt', self.save_check_service_check_box.isChecked())
settings.setValue('auto unblank', self.auto_unblank_check_box.isChecked())
settings.setValue('click live slide to unblank', self.click_live_slide_to_unblank_check_box.isChecked())
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-04-12 16:37:45 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-21 12:51:38 +
@@ -20,8 +20,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/366335 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Media plays successfully and cleanups.
Added VLC additions
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/366335
Media now plays, stops, seeks and repeats.
Media Tab now works but needs more love.
VLC addtitions is now added and usable.
Experimental flag added to UI. Set this and it may go bang. You will need to
edit settings manually to release this!
Add code (provided by tgc and superfly) to get media components. Works fine
outside OpenLP but takes out OpenLP on Fedora 30. Activate by using
experimental and restart.
Fixed the imagemanager bug on saving themes. Now works except preview image is
black!
Removed many bits of commented out code.
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-04-09 17:21:35 +
+++ openlp/core/common/settings.py 2019-04-21 09:00:48 +
@@ -213,6 +213,7 @@
'images/background color': '#00',
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
+'media/vlc additions': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/__init__.py 2019-04-21 09:00:48 +
@@ -93,4 +93,4 @@
self.resizeRowsToContents()
-__all__ = ['SingleColumnTableWidget']
+__all__ = ['SingleColumnTableWidget', 'DisplayControllerType']
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2019-03-16 10:20:46 +
+++ openlp/core/ui/generaltab.py 2019-04-21 09:00:48 +
@@ -113,6 +113,9 @@
self.check_for_updates_check_box = QtWidgets.QCheckBox(self.startup_group_box)
self.check_for_updates_check_box.setObjectName('check_for_updates_check_box')
self.startup_layout.addWidget(self.check_for_updates_check_box)
+self.experimental_check_box = QtWidgets.QCheckBox(self.startup_group_box)
+self.experimental_check_box.setObjectName('experimental_check_box')
+self.startup_layout.addWidget(self.experimental_check_box)
self.right_layout.addWidget(self.startup_group_box)
# Logo
self.logo_group_box = QtWidgets.QGroupBox(self.right_column)
@@ -180,6 +183,8 @@
self.logo_file_label.setText(translate('OpenLP.GeneralTab', 'Logo file:'))
self.logo_hide_on_startup_check_box.setText(translate('OpenLP.GeneralTab', 'Don\'t show logo on startup'))
self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP'))
+self.experimental_check_box.setText(translate('OpenLP.GeneralTab',
+ 'Experimental features (use at your own risk)'))
self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings'))
self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab',
'Prompt to save before starting a new service'))
@@ -222,6 +227,7 @@
self.logo_hide_on_startup_check_box.setChecked(settings.value('logo hide on startup'))
self.logo_color_button.color = self.logo_background_color
self.check_for_updates_check_box.setChecked(settings.value('update check'))
+self.experimental_check_box.setChecked(settings.value('experimental'))
self.auto_preview_check_box.setChecked(settings.value('auto preview'))
self.timeout_spin_box.setValue(settings.value('loop delay'))
self.start_paused_check_box.setChecked(settings.value('audio start paused'))
@@ -241,6 +247,7 @@
settings.setValue('logo file', self.logo_file_path_edit.path)
settings.setValue('logo hide on startup', self.logo_hide_on_startup_check_box.isChecked())
settings.setValue('update check', self.check_for_updates_check_box.isChecked())
+settings.setValue('experimental', self.experimental_check_box.isChecked())
settings.setValue('save prompt', self.save_check_service_check_box.isChecked())
settings.setValue('auto unblank', self.auto_unblank_check_box.isChecked())
settings.setValue('click live slide to unblank', self.click_live_slide_to_unblank_check_box.isChecked())
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-04-12 16:37:45 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-21 09:00:48 +
@@ -20,8 +20,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/gpl3 into lp:openlp
Review: Needs Information What about the test files. Are you going to fix those as well? -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/365987 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/pylint-fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/pylint-fixes/+merge/365986 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/pylint-fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~tomasgroth/openlp/pylint-fixes/+merge/365979 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/wix-packaging into lp:openlp/packaging
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/wix-packaging/+merge/365880 Your team OpenLP Core is subscribed to branch lp:openlp/packaging. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
This is work in progress and needs 1 more merge to finish. The commented our code is not needed and needs to be cleaned up but want to keep till I finish. The stream code is the next set and I have infor for linux and windows but not mac. Did ask the mailing list and only tgc responded. -- https://code.launchpad.net/~trb143/openlp/media_state/+merge/365879 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/media_state into lp:openlp.
Commit message:
VLC plays and handles missing live display gracefully. Preview still works.
Added experimental setting to remove UI incomplete stuff.
various bug fixes and improvments,
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1823575 in OpenLP: "PluginManager still has plugin list"
https://bugs.launchpad.net/openlp/+bug/1823575
For more details, see:
https://code.launchpad.net/~trb143/openlp/media_state/+merge/365879
New merge request as being inconsistent.
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/media_state into lp:openlp.
=== modified file '.bzrignore'
--- .bzrignore 2019-03-04 20:37:11 +
+++ .bzrignore 2019-04-11 20:30:04 +
@@ -15,6 +15,7 @@
*.e4*
*eric[1-9]project
.git
+env
# Git files
.gitignore
htmlcov
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-03-03 13:32:31 +
+++ openlp/core/common/settings.py 2019-04-11 20:30:04 +
@@ -129,6 +129,9 @@
``advanced/slide limits`` to ``SlideLimits.Wrap``. **NOTE**, this means that the rules have to cover all cases!
So, if the type of the old value is bool, then there must be two rules.
"""
+on_monitor_default = True
+if log.isEnabledFor(logging.DEBUG):
+on_monitor_default = False
__default_settings__ = {
'settings/version': 0,
'advanced/add page break': False,
@@ -185,6 +188,7 @@
'core/click live slide to unblank': False,
'core/blank warning': False,
'core/ccli number': '',
+'core/experimental': False,
'core/has run wizard': False,
'core/language': '[en]',
'core/last version test': '',
@@ -202,13 +206,13 @@
'core/view mode': 'default',
# The other display settings (display position and dimensions) are defined in the ScreenList class due to a
# circular dependency.
-'core/display on monitor': True,
+'core/display on monitor': on_monitor_default,
'core/override position': False,
'core/monitor': {},
'core/application version': '0.0',
'images/background color': '#00',
-'media/players': 'system,webkit',
-'media/override player': QtCore.Qt.Unchecked,
+'media/media auto start': QtCore.Qt.Unchecked,
+'media/stream command': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
@@ -311,7 +315,9 @@
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
('bibles/proxy username', '', []),
-('bibles/proxy password', '', [])
+('bibles/proxy password', '', []),
+('media/players', '', []),
+('media/override player', '', [])
]
@staticmethod
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2019-02-14 15:09:09 +
+++ openlp/core/lib/theme.py 2019-04-11 20:30:04 +
@@ -46,6 +46,7 @@
Image = 2
Transparent = 3
Video = 4
+Stream = 5
@staticmethod
def to_string(background_type):
@@ -62,6 +63,8 @@
return 'transparent'
elif background_type == BackgroundType.Video:
return 'video'
+elif background_type == BackgroundType.Stream:
+return 'stream'
@staticmethod
def from_string(type_string):
@@ -78,6 +81,8 @@
return BackgroundType.Transparent
elif type_string == 'video':
return BackgroundType.Video
+elif type_string == 'stream':
+return BackgroundType.Stream
class BackgroundGradientType(object):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-03-17 10:01:52 +
+++ openlp/core/ui/media/__init__.py 2019-04-11 20:30:04 +
@@ -48,6 +48,7 @@
CD = 3
DVD = 4
Folder = 5
+Stream = 6
class ItemMediaInfo(object):
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-11 20:30:04 +
@@ -23,7 +23,6 @@
The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets
related to playing media, such as sliders.
"""
-import datetime
import logging
try:
@@ -33,7 +32,7 @@
pymediainfo_available = False
from subprocess import check_output
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore
from openlp.core.state import State
from openlp.core.api.http import register_endpoint
@@ -44,11 +43,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error
[Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/media_state into lp:openlp.
Commit message:
Fix up VLC so it works and plays.
Still not finished but getting there.
Requested reviews:
Phill (phill-ridout)
Related bugs:
Bug #1823575 in OpenLP: "PluginManager still has plugin list"
https://bugs.launchpad.net/openlp/+bug/1823575
For more details, see:
https://code.launchpad.net/~trb143/openlp/media_state/+merge/365821
VLC plays and handles missing live display gracefully. Preview still works.
Added experimental setting to remove UI incomplete stuff.
various bug fixes and improvments,
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file '.bzrignore'
--- .bzrignore 2019-03-04 20:37:11 +
+++ .bzrignore 2019-04-10 19:57:31 +
@@ -15,6 +15,7 @@
*.e4*
*eric[1-9]project
.git
+env
# Git files
.gitignore
htmlcov
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-03-03 13:32:31 +
+++ openlp/core/common/settings.py 2019-04-10 19:57:31 +
@@ -129,6 +129,9 @@
``advanced/slide limits`` to ``SlideLimits.Wrap``. **NOTE**, this means that the rules have to cover all cases!
So, if the type of the old value is bool, then there must be two rules.
"""
+on_monitor_default = True
+if log.isEnabledFor(logging.DEBUG):
+on_monitor_default = False
__default_settings__ = {
'settings/version': 0,
'advanced/add page break': False,
@@ -185,6 +188,7 @@
'core/click live slide to unblank': False,
'core/blank warning': False,
'core/ccli number': '',
+'core/experimental': False,
'core/has run wizard': False,
'core/language': '[en]',
'core/last version test': '',
@@ -202,13 +206,13 @@
'core/view mode': 'default',
# The other display settings (display position and dimensions) are defined in the ScreenList class due to a
# circular dependency.
-'core/display on monitor': True,
+'core/display on monitor': on_monitor_default,
'core/override position': False,
'core/monitor': {},
'core/application version': '0.0',
'images/background color': '#00',
-'media/players': 'system,webkit',
-'media/override player': QtCore.Qt.Unchecked,
+'media/media auto start': QtCore.Qt.Unchecked,
+'media/stream command': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
@@ -311,7 +315,9 @@
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
('bibles/proxy username', '', []),
-('bibles/proxy password', '', [])
+('bibles/proxy password', '', []),
+('media/players', '', []),
+('media/override player', '', [])
]
@staticmethod
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2019-02-14 15:09:09 +
+++ openlp/core/lib/theme.py 2019-04-10 19:57:31 +
@@ -46,6 +46,7 @@
Image = 2
Transparent = 3
Video = 4
+Stream = 5
@staticmethod
def to_string(background_type):
@@ -62,6 +63,8 @@
return 'transparent'
elif background_type == BackgroundType.Video:
return 'video'
+elif background_type == BackgroundType.Stream:
+return 'stream'
@staticmethod
def from_string(type_string):
@@ -78,6 +81,8 @@
return BackgroundType.Transparent
elif type_string == 'video':
return BackgroundType.Video
+elif type_string == 'stream':
+return BackgroundType.Stream
class BackgroundGradientType(object):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-03-17 10:01:52 +
+++ openlp/core/ui/media/__init__.py 2019-04-10 19:57:31 +
@@ -48,6 +48,7 @@
CD = 3
DVD = 4
Folder = 5
+Stream = 6
class ItemMediaInfo(object):
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-10 19:57:31 +
@@ -23,7 +23,6 @@
The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets
related to playing media, such as sliders.
"""
-import datetime
import logging
try:
@@ -33,7 +32,7 @@
pymediainfo_available = False
from subprocess import check_output
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore
from openlp.core.state import State
from openlp.core.api.http import register_endpoint
@@ -44,11 +43,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.co
[Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
The proposal to merge lp:~trb143/openlp/media_state into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/media_state/+merge/365762 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Needs Fixing Please remove the media changes. -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365765 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~rafaellerm/openlp/media_import_fix into lp:openlp
This is old code and the application has changed since this was started, If it is still an issue please resubmit. -- https://code.launchpad.net/~rafaellerm/openlp/media_import_fix/+merge/210113 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~rafaellerm/openlp/media_import_fix into lp:openlp
The proposal to merge lp:~rafaellerm/openlp/media_import_fix into lp:openlp has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~rafaellerm/openlp/media_import_fix/+merge/210113 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
