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

Fixes

This commit is contained in:
Tim Bentley 2016-06-06 17:44:14 +01:00
parent 15bf9420ae
commit b8b05bb665
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/registry.py
View File

@ -24,7 +24,6 @@ Provide Registry Services
""" """
import logging import logging
import sys import sys
import re
from openlp.core.common import trace_error_handler from openlp.core.common import trace_error_handler
@ -57,7 +56,6 @@ class Registry(object):
registry.service_list = {} registry.service_list = {}
registry.functions_list = {} registry.functions_list = {}
registry.working_flags = {} registry.working_flags = {}
registry.remote_apis = {}
# Allow the tests to remove Registry entries but not the live system # Allow the tests to remove Registry entries but not the live system
registry.running_under_test = 'nose' in sys.argv[0] registry.running_under_test = 'nose' in sys.argv[0]
registry.initialising = True registry.initialising = True

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

@ -607,7 +607,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
self.generate_slide_data(service_item) self.generate_slide_data(service_item)
self.service_manager.add_service_item(service_item, replace=True) self.service_manager.add_service_item(service_item, replace=True)
else: 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'), QtWidgets.QMessageBox.information(self, translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
translate('OpenLP.MediaManagerItem', translate('OpenLP.MediaManagerItem',
'You must select a {title} ' 'You must select a {title} '

2
openlp/core/lib/serviceitem.py
View File

@ -286,7 +286,7 @@ class ServiceItem(RegistryProperties):
:param path: The directory in which the image file is located. :param path: The directory in which the image file is located.
:param title: A title for the slide in the service item. :param title: A title for the slide in the service item.
:param background: :param background:
:param thumbnail: Optional alternative thumbnail, used for api thumbnails. :param thumbnail: Optional alternative thumbnail, used for remote thumbnails.
""" """
if background: if background:
self.image_border = background self.image_border = background

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

@ -129,7 +129,7 @@ class CustomMediaItem(MediaManagerItem):
self.list_view.setCurrentItem(custom_name) self.list_view.setCurrentItem(custom_name)
self.auto_select_id = -1 self.auto_select_id = -1
# Called to redisplay the custom list screen edith from a search # 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. # active trigger it and clean up so it will not update again.
self.check_search_result() self.check_search_result()

2
openlp/plugins/remotes/html/assets/jquery.js vendored
View File

@ -7158,7 +7158,7 @@ jQuery.fn.extend({
var self = this; var self = this;
// Request the api document // Request the remote document
jQuery.ajax({ jQuery.ajax({
url: url, url: url,
type: type, type: type,

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

@ -252,10 +252,10 @@ class RemoteTab(SettingsTab):
Generate icon for main window Generate icon for main window
""" """
self.remote_server_icon.hide() 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) icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
if Settings().value(self.settings_section + '/authentication enabled'): 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) overlay = overlay.scaled(60, 60, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
painter = QtGui.QPainter(icon) painter = QtGui.QPainter(icon)
painter.drawImage(20, 0, overlay) painter.drawImage(20, 0, overlay)

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

@ -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 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, QtWidgets.QMessageBox.information(self.main_window,
translate('RemotePlugin', 'Server Config Change'), translate('RemotePlugin', 'Server Config Change'),
translate('RemotePlugin', translate('RemotePlugin',

1
scripts/check_dependencies.py
View File

@ -95,6 +95,7 @@ MODULES = [
'uno', 'uno',
'websockets', 'websockets',
'asyncio', 'asyncio',
'waitress',
'six' 'six'
] ]