forked from openlp/openlp
Fixes
This commit is contained in:
parent
15bf9420ae
commit
b8b05bb665
@ -24,7 +24,6 @@ Provide Registry Services
|
||||
"""
|
||||
import logging
|
||||
import sys
|
||||
import re
|
||||
|
||||
from openlp.core.common import trace_error_handler
|
||||
|
||||
@ -57,7 +56,6 @@ class Registry(object):
|
||||
registry.service_list = {}
|
||||
registry.functions_list = {}
|
||||
registry.working_flags = {}
|
||||
registry.remote_apis = {}
|
||||
# Allow the tests to remove Registry entries but not the live system
|
||||
registry.running_under_test = 'nose' in sys.argv[0]
|
||||
registry.initialising = True
|
||||
|
@ -607,7 +607,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
self.generate_slide_data(service_item)
|
||||
self.service_manager.add_service_item(service_item, replace=True)
|
||||
else:
|
||||
# Turn off the api edit update message indicator
|
||||
# Turn off the remote edit update message indicator
|
||||
QtWidgets.QMessageBox.information(self, translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
|
||||
translate('OpenLP.MediaManagerItem',
|
||||
'You must select a {title} '
|
||||
|
@ -286,7 +286,7 @@ class ServiceItem(RegistryProperties):
|
||||
:param path: The directory in which the image file is located.
|
||||
:param title: A title for the slide in the service item.
|
||||
:param background:
|
||||
:param thumbnail: Optional alternative thumbnail, used for api thumbnails.
|
||||
:param thumbnail: Optional alternative thumbnail, used for remote thumbnails.
|
||||
"""
|
||||
if background:
|
||||
self.image_border = background
|
||||
|
@ -129,7 +129,7 @@ class CustomMediaItem(MediaManagerItem):
|
||||
self.list_view.setCurrentItem(custom_name)
|
||||
self.auto_select_id = -1
|
||||
# Called to redisplay the custom list screen edith from a search
|
||||
# or from the exit of the Custom edit dialog. If api editing is
|
||||
# or from the exit of the Custom edit dialog. If remote editing is
|
||||
# active trigger it and clean up so it will not update again.
|
||||
self.check_search_result()
|
||||
|
||||
|
2
openlp/plugins/remotes/html/assets/jquery.js
vendored
2
openlp/plugins/remotes/html/assets/jquery.js
vendored
@ -7158,7 +7158,7 @@ jQuery.fn.extend({
|
||||
|
||||
var self = this;
|
||||
|
||||
// Request the api document
|
||||
// Request the remote document
|
||||
jQuery.ajax({
|
||||
url: url,
|
||||
type: type,
|
||||
|
@ -252,10 +252,10 @@ class RemoteTab(SettingsTab):
|
||||
Generate icon for main window
|
||||
"""
|
||||
self.remote_server_icon.hide()
|
||||
icon = QtGui.QImage(':/api/network_server.png')
|
||||
icon = QtGui.QImage(':/remote/network_server.png')
|
||||
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
|
||||
if Settings().value(self.settings_section + '/authentication enabled'):
|
||||
overlay = QtGui.QImage(':/api/network_auth.png')
|
||||
overlay = QtGui.QImage(':/remote/network_auth.png')
|
||||
overlay = overlay.scaled(60, 60, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
|
||||
painter = QtGui.QPainter(icon)
|
||||
painter.drawImage(20, 0, overlay)
|
||||
|
@ -115,7 +115,7 @@ class RemotesPlugin(Plugin, OpenLPMixin):
|
||||
"""
|
||||
Called when Config is changed to requests a restart with the server on new address or port
|
||||
"""
|
||||
log.debug('api config changed')
|
||||
log.debug('remote config changed')
|
||||
QtWidgets.QMessageBox.information(self.main_window,
|
||||
translate('RemotePlugin', 'Server Config Change'),
|
||||
translate('RemotePlugin',
|
||||
|
@ -95,6 +95,7 @@ MODULES = [
|
||||
'uno',
|
||||
'websockets',
|
||||
'asyncio',
|
||||
'waitress',
|
||||
'six'
|
||||
]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user