raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Too many changes

This commit is contained in:
Tim Bentley 2016-06-05 22:26:06 +01:00
parent 32fad35f79
commit 2b0e61d5fd
13 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/mediamanageritem.py
View File

@ -453,7 +453,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
:param service_item: The service Item to be processed
:param item: The database item to be used to build the service item
:param xml_version:
:param remote: Was this api triggered (False)
:param remote: Was this remote triggered (False)
:param context: The service context
"""
raise NotImplementedError('MediaManagerItem.generate_slide_data needs to be defined by the plugin')
@ -580,7 +580,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
:param item: Item to be processed
:param replace: Replace the existing item
:param remote: Triggered from api
:param remote: Triggered from remote
:param position: Position to place item
"""
service_item = self.build_service_item(item, True, remote=remote, context=ServiceItemContext.Service)

2
openlp/core/lib/projector/constants.py
View File

@ -229,7 +229,7 @@ ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'), # E_OK | S_OK
E_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
'The connection was refused by the peer (or timed out)'),
E_REMOTE_HOST_CLOSED_CONNECTION: translate('OpenLP.ProjectorConstants',
'The api host closed the connection'),
'The remote host closed the connection'),
E_HOST_NOT_FOUND: translate('OpenLP.ProjectorConstants', 'The host address was not found'),
E_SOCKET_ACCESS: translate('OpenLP.ProjectorConstants',
'The socket operation failed because the application '

2
openlp/core/lib/projector/pjlink1.py
View File

@ -396,7 +396,7 @@ class PJLink1(QTcpSocket):
return
log.debug('({ip}) get_data(): Checking new data "{data}"'.format(ip=self.ip, data=data))
if data.upper().startswith('PJLINK'):
# Reconnected from api host disconnect ?
# Reconnected from remote host disconnect ?
self.check_login(data)
self.send_busy = False
self.projectorReceivedData.emit()

6
openlp/core/ui/servicemanager.py
View File

@ -344,7 +344,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
"""
Setter for property "modified". Sets whether or not the current service has been modified.
:param modified: Indicates if the service has new or removed items. Used to trigger a api update.
:param modified: Indicates if the service has new or removed items. Used to trigger a remote update.
"""
if modified:
self.service_id += 1
@ -1079,7 +1079,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
def on_set_item(self, message, field=None):
"""
Called by a signal to select a specific item and make it live usually from api.
Called by a signal to select a specific item and make it live usually from remote.
:param field:
:param message: The data passed in from a remove message
@ -1523,7 +1523,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
def remote_edit(self, field=None):
"""
Triggers a api edit to a plugin to allow item to be edited.
Triggers a remote edit to a plugin to allow item to be edited.
:param field:
"""
item = self.find_service_item()[0]

8
openlp/core/ui/slidecontroller.py
View File

@ -531,7 +531,7 @@ class SlideController(DisplayController, RegistryProperties):
def toggle_display(self, action):
"""
Toggle the display settings triggered from api messages.
Toggle the display settings triggered from remote messages.
:param action: The blank action to be processed.
"""
@ -797,7 +797,7 @@ class SlideController(DisplayController, RegistryProperties):
def replace_service_manager_item(self, item):
"""
Replacement item following a api edit
Replacement item following a remote edit
:param item: The current service item
"""
@ -841,7 +841,7 @@ class SlideController(DisplayController, RegistryProperties):
"""
self.on_stop_loop()
old_item = self.service_item
# rest to allow the api pick up verse 1 if large imaged
# rest to allow the remote pick up verse 1 if large imaged
self.selected_row = 0
# take a copy not a link to the servicemanager copy.
self.service_item = copy.copy(service_item)
@ -931,7 +931,7 @@ class SlideController(DisplayController, RegistryProperties):
"""
Go to the requested slide
:param message: api message to be processed.
:param message: remote message to be processed.
"""
index = int(message[0])
if not self.service_item:

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -798,7 +798,7 @@ class BibleMediaItem(MediaManagerItem):
:param service_item: The service item to be built on
:param item: The Song item to be used
:param xml_version: The xml version (not used)
:param remote: Triggered from api
:param remote: Triggered from remote
:param context: Why is it being generated
"""
log.debug('generating slide data')

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -543,7 +543,7 @@ class ImageMediaItem(MediaManagerItem):
:param service_item: The service item to be built on
:param item: The Song item to be used
:param xml_version: The xml version (not used)
:param remote: Triggered from api
:param remote: Triggered from remote
:param context: Why is it being generated
"""
background = QtGui.QColor(Settings().value(self.settings_section + '/background color'))

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -242,7 +242,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
:param service_item: The service item to be built on
:param item: The Song item to be used
:param xml_version: The xml version (not used)
:param remote: Triggered from api
:param remote: Triggered from remote
:param context: Why is it being generated
"""
if item is None:

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -266,7 +266,7 @@ class PresentationMediaItem(MediaManagerItem):
:param service_item: The service item to be built on
:param item: The Song item to be used
:param xml_version: The xml version (not used)
:param remote: Triggered from api
:param remote: Triggered from remote
:param context: Why is it being generated
"""
if item:

2
openlp/plugins/remotes/lib/remotetab.py
View File

@ -151,7 +151,7 @@ class RemoteTab(SettingsTab):
self.live_url_label.setText(translate('RemotePlugin.RemoteTab', 'Live view URL:'))
self.twelve_hour_check_box.setText(translate('RemotePlugin.RemoteTab', 'Display stage time in 12h format'))
self.thumbnails_check_box.setText(translate('RemotePlugin.RemoteTab',
'Show thumbnails of non-text slides in api and stage view.'))
'Show thumbnails of non-text slides in remote and stage view.'))
self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
self.android_qr_description_label.setText(
translate('RemotePlugin.RemoteTab',

4
openlp/plugins/remotes/remoteplugin.py
View File

@ -92,9 +92,9 @@ class RemotesPlugin(Plugin, OpenLPMixin):
Information about this plugin
"""
about_text = translate('RemotePlugin', '<strong>Remote Plugin</strong>'
'<br />The api plugin provides the ability to send messages to '
'<br />The remote plugin provides the ability to send messages to '
'a running version of OpenLP on a different computer via a web '
'browser or through the api API.')
'browser or through the remote API.')
return about_text
def set_plugin_text_strings(self):

6
openlp/plugins/songs/lib/mediaitem.py
View File

@ -242,11 +242,11 @@ class SongMediaItem(MediaManagerItem):
def on_song_list_load(self):
"""
Handle the exit from the edit dialog and trigger api updates of songs
Handle the exit from the edit dialog and trigger remote updates of songs
"""
log.debug('on_song_list_load - start')
# Called to redisplay the song list screen edit from a search or from the exit of the Song edit dialog. If
# api editing is active Trigger it and clean up so it will not update again. Push edits to the service
# remote editing is active Trigger it and clean up so it will not update again. Push edits to the service
# manager to update items
if self.edit_item and self.update_service_on_edit and not self.remote_triggered:
item = self.build_service_item(self.edit_item)
@ -555,7 +555,7 @@ class SongMediaItem(MediaManagerItem):
:param service_item: The service item to be built on
:param item: The Song item to be used
:param xml_version: The xml version (not used)
:param remote: Triggered from api
:param remote: Triggered from remote
:param context: Why is it being generated
"""
log.debug('generate_slide_data: {service}, {item}, {remote}'.format(service=service_item, item=item,

2
tests/functional/openlp_plugins/songs/test_mediaitem.py
View File

@ -502,7 +502,7 @@ class TestMediaItem(TestCase, TestMixin):
def build_remote_search_test(self):
"""
Test results for the api search api
Test results for the remote search api
"""
# GIVEN: A Song and a search a JSON array should be returned.
mock_song = MagicMock()