forked from openlp/openlp
This commit is contained in:
commit
af69e76274
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
@ -26,7 +19,6 @@
|
|||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Provide a work around for a bug in QFileDialog <https://bugs.launchpad.net/openlp/+bug/1209515>
|
Provide a work around for a bug in QFileDialog <https://bugs.launchpad.net/openlp/+bug/1209515>
|
||||||
"""
|
"""
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
@ -153,72 +146,66 @@ PJLINK_ERRORS = {'ERRA': E_AUTHENTICATION, # Authentication error
|
|||||||
'ERR2': E_PARAMETER, # Invalid parameter error
|
'ERR2': E_PARAMETER, # Invalid parameter error
|
||||||
'ERR3': E_UNAVAILABLE, # Projector busy
|
'ERR3': E_UNAVAILABLE, # Projector busy
|
||||||
'ERR4': E_PROJECTOR, # Projector or display failure
|
'ERR4': E_PROJECTOR, # Projector or display failure
|
||||||
E_AUTHENTICATION: translate('OpenLP.ProjectorConstants', 'ERRA'),
|
E_AUTHENTICATION: 'ERRA',
|
||||||
E_UNDEFINED: translate('OpenLP.ProjectorConstants', 'ERR1'),
|
E_UNDEFINED: 'ERR1',
|
||||||
E_PARAMETER: translate('OpenLP.ProjectorConstants', 'ERR2'),
|
E_PARAMETER: 'ERR2',
|
||||||
E_UNAVAILABLE: translate('OpenLP.ProjectorConstants', 'ERR3'),
|
E_UNAVAILABLE: 'ERR3',
|
||||||
E_PROJECTOR: translate('OpenLP.ProjectorConstants', 'ERR4')}
|
E_PROJECTOR: 'ERR4'}
|
||||||
|
|
||||||
# Map error/status codes to string
|
# Map error/status codes to string
|
||||||
ERROR_STRING = {0: translate('OpenLP.ProjectorConstants', 'S_OK'),
|
ERROR_STRING = {0: 'S_OK',
|
||||||
E_GENERAL: translate('OpenLP.ProjectorConstants', 'E_GENERAL'),
|
E_GENERAL: 'E_GENERAL',
|
||||||
E_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'E_NOT_CONNECTED'),
|
E_NOT_CONNECTED: 'E_NOT_CONNECTED',
|
||||||
E_FAN: translate('OpenLP.ProjectorConstants', 'E_FAN'),
|
E_FAN: 'E_FAN',
|
||||||
E_LAMP: translate('OpenLP.ProjectorConstants', 'E_LAMP'),
|
E_LAMP: 'E_LAMP',
|
||||||
E_TEMP: translate('OpenLP.ProjectorConstants', 'E_TEMP'),
|
E_TEMP: 'E_TEMP',
|
||||||
E_COVER: translate('OpenLP.ProjectorConstants', 'E_COVER'),
|
E_COVER: 'E_COVER',
|
||||||
E_FILTER: translate('OpenLP.ProjectorConstants', 'E_FILTER'),
|
E_FILTER: 'E_FILTER',
|
||||||
E_AUTHENTICATION: translate('OpenLP.ProjectorConstants', 'E_AUTHENTICATION'),
|
E_AUTHENTICATION: 'E_AUTHENTICATION',
|
||||||
E_NO_AUTHENTICATION: translate('OpenLP.ProjectorConstants', 'E_NO_AUTHENTICATION'),
|
E_NO_AUTHENTICATION: 'E_NO_AUTHENTICATION',
|
||||||
E_UNDEFINED: translate('OpenLP.ProjectorConstants', 'E_UNDEFINED'),
|
E_UNDEFINED: 'E_UNDEFINED',
|
||||||
E_PARAMETER: translate('OpenLP.ProjectorConstants', 'E_PARAMETER'),
|
E_PARAMETER: 'E_PARAMETER',
|
||||||
E_UNAVAILABLE: translate('OpenLP.ProjectorConstants', 'E_UNAVAILABLE'),
|
E_UNAVAILABLE: 'E_UNAVAILABLE',
|
||||||
E_PROJECTOR: translate('OpenLP.ProjectorConstants', 'E_PROJECTOR'),
|
E_PROJECTOR: 'E_PROJECTOR',
|
||||||
E_INVALID_DATA: translate('OpenLP.ProjectorConstants', 'E_INVALID_DATA'),
|
E_INVALID_DATA: 'E_INVALID_DATA',
|
||||||
E_WARN: translate('OpenLP.ProjectorConstants', 'E_WARN'),
|
E_WARN: 'E_WARN',
|
||||||
E_ERROR: translate('OpenLP.ProjectorConstants', 'E_ERROR'),
|
E_ERROR: 'E_ERROR',
|
||||||
E_CLASS: translate('OpenLP.ProjectorConstants', 'E_CLASS'),
|
E_CLASS: 'E_CLASS',
|
||||||
E_PREFIX: translate('OpenLP.ProjectorConstants', 'E_PREFIX'), # Last projector error
|
E_PREFIX: 'E_PREFIX', # Last projector error
|
||||||
E_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants',
|
E_CONNECTION_REFUSED: 'E_CONNECTION_REFUSED', # First QtSocket error
|
||||||
'E_CONNECTION_REFUSED'), # First QtSocket error
|
E_REMOTE_HOST_CLOSED_CONNECTION: 'E_REMOTE_HOST_CLOSED_CONNECTION',
|
||||||
E_REMOTE_HOST_CLOSED_CONNECTION: translate('OpenLP.ProjectorConstants',
|
E_HOST_NOT_FOUND: 'E_HOST_NOT_FOUND',
|
||||||
'E_REMOTE_HOST_CLOSED_CONNECTION'),
|
E_SOCKET_ACCESS: 'E_SOCKET_ACCESS',
|
||||||
E_HOST_NOT_FOUND: translate('OpenLP.ProjectorConstants', 'E_HOST_NOT_FOUND'),
|
E_SOCKET_RESOURCE: 'E_SOCKET_RESOURCE',
|
||||||
E_SOCKET_ACCESS: translate('OpenLP.ProjectorConstants', 'E_SOCKET_ACCESS'),
|
E_SOCKET_TIMEOUT: 'E_SOCKET_TIMEOUT',
|
||||||
E_SOCKET_RESOURCE: translate('OpenLP.ProjectorConstants', 'E_SOCKET_RESOURCE'),
|
E_DATAGRAM_TOO_LARGE: 'E_DATAGRAM_TOO_LARGE',
|
||||||
E_SOCKET_TIMEOUT: translate('OpenLP.ProjectorConstants', 'E_SOCKET_TIMEOUT'),
|
E_NETWORK: 'E_NETWORK',
|
||||||
E_DATAGRAM_TOO_LARGE: translate('OpenLP.ProjectorConstants', 'E_DATAGRAM_TOO_LARGE'),
|
E_ADDRESS_IN_USE: 'E_ADDRESS_IN_USE',
|
||||||
E_NETWORK: translate('OpenLP.ProjectorConstants', 'E_NETWORK'),
|
E_SOCKET_ADDRESS_NOT_AVAILABLE: 'E_SOCKET_ADDRESS_NOT_AVAILABLE',
|
||||||
E_ADDRESS_IN_USE: translate('OpenLP.ProjectorConstants', 'E_ADDRESS_IN_USE'),
|
E_UNSUPPORTED_SOCKET_OPERATION: 'E_UNSUPPORTED_SOCKET_OPERATION',
|
||||||
E_SOCKET_ADDRESS_NOT_AVAILABLE: translate('OpenLP.ProjectorConstants',
|
E_PROXY_AUTHENTICATION_REQUIRED: 'E_PROXY_AUTHENTICATION_REQUIRED',
|
||||||
'E_SOCKET_ADDRESS_NOT_AVAILABLE'),
|
E_SLS_HANDSHAKE_FAILED: 'E_SLS_HANDSHAKE_FAILED',
|
||||||
E_UNSUPPORTED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
|
E_UNFINISHED_SOCKET_OPERATION: 'E_UNFINISHED_SOCKET_OPERATION',
|
||||||
'E_UNSUPPORTED_SOCKET_OPERATION'),
|
E_PROXY_CONNECTION_REFUSED: 'E_PROXY_CONNECTION_REFUSED',
|
||||||
E_PROXY_AUTHENTICATION_REQUIRED: translate('OpenLP.ProjectorConstants',
|
E_PROXY_CONNECTION_CLOSED: 'E_PROXY_CONNECTION_CLOSED',
|
||||||
'E_PROXY_AUTHENTICATION_REQUIRED'),
|
E_PROXY_CONNECTION_TIMEOUT: 'E_PROXY_CONNECTION_TIMEOUT',
|
||||||
E_SLS_HANDSHAKE_FAILED: translate('OpenLP.ProjectorConstants', 'E_SLS_HANDSHAKE_FAILED'),
|
E_PROXY_NOT_FOUND: 'E_PROXY_NOT_FOUND',
|
||||||
E_UNFINISHED_SOCKET_OPERATION: translate('OpenLP.ProjectorConstants',
|
E_PROXY_PROTOCOL: 'E_PROXY_PROTOCOL',
|
||||||
'E_UNFINISHED_SOCKET_OPERATION'),
|
E_UNKNOWN_SOCKET_ERROR: 'E_UNKNOWN_SOCKET_ERROR'}
|
||||||
E_PROXY_CONNECTION_REFUSED: translate('OpenLP.ProjectorConstants', 'E_PROXY_CONNECTION_REFUSED'),
|
|
||||||
E_PROXY_CONNECTION_CLOSED: translate('OpenLP.ProjectorConstants', 'E_PROXY_CONNECTION_CLOSED'),
|
|
||||||
E_PROXY_CONNECTION_TIMEOUT: translate('OpenLP.ProjectorConstants', 'E_PROXY_CONNECTION_TIMEOUT'),
|
|
||||||
E_PROXY_NOT_FOUND: translate('OpenLP.ProjectorConstants', 'E_PROXY_NOT_FOUND'),
|
|
||||||
E_PROXY_PROTOCOL: translate('OpenLP.ProjectorConstants', 'E_PROXY_PROTOCOL'),
|
|
||||||
E_UNKNOWN_SOCKET_ERROR: translate('OpenLP.ProjectorConstants', 'E_UNKNOWN_SOCKET_ERROR')}
|
|
||||||
|
|
||||||
STATUS_STRING = {S_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'S_NOT_CONNECTED'),
|
STATUS_STRING = {S_NOT_CONNECTED: 'S_NOT_CONNECTED',
|
||||||
S_CONNECTING: translate('OpenLP.ProjectorConstants', 'S_CONNECTING'),
|
S_CONNECTING: 'S_CONNECTING',
|
||||||
S_CONNECTED: translate('OpenLP.ProjectorConstants', 'S_CONNECTED'),
|
S_CONNECTED: 'S_CONNECTED',
|
||||||
S_STATUS: translate('OpenLP.ProjectorConstants', 'S_STATUS'),
|
S_STATUS: 'S_STATUS',
|
||||||
S_OFF: translate('OpenLP.ProjectorConstants', 'S_OFF'),
|
S_OFF: 'S_OFF',
|
||||||
S_INITIALIZE: translate('OpenLP.ProjectorConstants', 'S_INITIALIZE'),
|
S_INITIALIZE: 'S_INITIALIZE',
|
||||||
S_STANDBY: translate('OpenLP.ProjectorConstants', 'S_STANDBY'),
|
S_STANDBY: 'S_STANDBY',
|
||||||
S_WARMUP: translate('OpenLP.ProjectorConstants', 'S_WARMUP'),
|
S_WARMUP: 'S_WARMUP',
|
||||||
S_ON: translate('OpenLP.ProjectorConstants', 'S_ON'),
|
S_ON: 'S_ON',
|
||||||
S_COOLDOWN: translate('OpenLP.ProjectorConstants', 'S_COOLDOWN'),
|
S_COOLDOWN: 'S_COOLDOWN',
|
||||||
S_INFO: translate('OpenLP.ProjectorConstants', 'S_INFO'),
|
S_INFO: 'S_INFO',
|
||||||
S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'S_NETWORK_SENDING'),
|
S_NETWORK_SENDING: 'S_NETWORK_SENDING',
|
||||||
S_NETWORK_RECEIVED: translate('OpenLP.ProjectorConstants', 'S_NETWORK_RECEIVED')}
|
S_NETWORK_RECEIVED: 'S_NETWORK_RECEIVED'}
|
||||||
|
|
||||||
# Map error/status codes to message strings
|
# Map error/status codes to message strings
|
||||||
ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'), # E_OK | S_OK
|
ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'), # E_OK | S_OK
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer, #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Erode Woldsund, Martin Zibricky #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
@ -85,9 +78,7 @@ class PlayerTab(SettingsTab):
|
|||||||
self.information_label.setWordWrap(True)
|
self.information_label.setWordWrap(True)
|
||||||
self.form_layout.addRow(self.information_label)
|
self.form_layout.addRow(self.information_label)
|
||||||
self.left_layout.addWidget(self.background_color_group_box)
|
self.left_layout.addWidget(self.background_color_group_box)
|
||||||
self.left_layout.addStretch()
|
|
||||||
self.right_column.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
|
self.right_column.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
|
||||||
self.right_layout.addStretch()
|
|
||||||
self.media_player_group_box = QtGui.QGroupBox(self.left_column)
|
self.media_player_group_box = QtGui.QGroupBox(self.left_column)
|
||||||
self.media_player_group_box.setObjectName('media_player_group_box')
|
self.media_player_group_box.setObjectName('media_player_group_box')
|
||||||
self.media_player_layout = QtGui.QVBoxLayout(self.media_player_group_box)
|
self.media_player_layout = QtGui.QVBoxLayout(self.media_player_group_box)
|
||||||
|
7
openlp/core/ui/media/vendor/__init__.py
vendored
7
openlp/core/ui/media/vendor/__init__.py
vendored
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer, #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Erode Woldsund, Martin Zibricky #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
@ -6,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -1389,6 +1389,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
|
|||||||
if expand is None:
|
if expand is None:
|
||||||
expand = Settings().value('advanced/expand service item')
|
expand = Settings().value('advanced/expand service item')
|
||||||
item.from_service = True
|
item.from_service = True
|
||||||
|
if position != -1:
|
||||||
self.drop_position = position
|
self.drop_position = position
|
||||||
if replace:
|
if replace:
|
||||||
s_item, child = self.find_service_item()
|
s_item, child = self.find_service_item()
|
||||||
|
@ -287,6 +287,7 @@ class SlideController(DisplayController, RegistryProperties):
|
|||||||
self.delay_spin_box.setRange(1, 180)
|
self.delay_spin_box.setRange(1, 180)
|
||||||
self.delay_spin_box.setSuffix(UiStrings().Seconds)
|
self.delay_spin_box.setSuffix(UiStrings().Seconds)
|
||||||
self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.'))
|
self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.'))
|
||||||
|
self.receive_spin_delay()
|
||||||
self.toolbar.add_toolbar_widget(self.delay_spin_box)
|
self.toolbar.add_toolbar_widget(self.delay_spin_box)
|
||||||
else:
|
else:
|
||||||
self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
|
self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
|
||||||
|
@ -602,7 +602,7 @@ class BibleImportForm(OpenLPWizard):
|
|||||||
if bible_type == BibleFormat.WebDownload:
|
if bible_type == BibleFormat.WebDownload:
|
||||||
self.progress_label.setText(
|
self.progress_label.setText(
|
||||||
translate('BiblesPlugin.ImportWizardForm', 'Registered Bible. Please note, that verses will be '
|
translate('BiblesPlugin.ImportWizardForm', 'Registered Bible. Please note, that verses will be '
|
||||||
'downloaded on\ndemand and thus an internet connection is required.'))
|
'downloaded on demand and thus an internet connection is required.'))
|
||||||
else:
|
else:
|
||||||
self.progress_label.setText(WizardStrings.FinishedImport)
|
self.progress_label.setText(WizardStrings.FinishedImport)
|
||||||
else:
|
else:
|
||||||
|
@ -175,10 +175,26 @@ def update_reference_separators():
|
|||||||
"""
|
"""
|
||||||
Updates separators and matches for parsing and formating scripture references.
|
Updates separators and matches for parsing and formating scripture references.
|
||||||
"""
|
"""
|
||||||
default_separators = \
|
default_separators = [
|
||||||
translate('BiblesPlugin',
|
'|'.join([
|
||||||
':|v|V|verse|verses;;-|to;;,|and;;end Double-semicolon delimited separators for parsing references. '
|
translate('BiblesPlugin', ':', 'Verse identifier e.g. Genesis 1 : 1 = Genesis Chapter 1 Verse 1'),
|
||||||
'Consult the developers for further information.').split(';;')
|
translate('BiblesPlugin', 'v','Verse identifier e.g. Genesis 1 v 1 = Genesis Chapter 1 Verse 1'),
|
||||||
|
translate('BiblesPlugin', 'V', 'Verse identifier e.g. Genesis 1 V 1 = Genesis Chapter 1 Verse 1'),
|
||||||
|
translate('BiblesPlugin', 'verse', 'Verse identifier e.g. Genesis 1 verse 1 = Genesis Chapter 1 Verse 1'),
|
||||||
|
translate('BiblesPlugin', 'verses',
|
||||||
|
'Verse identifier e.g. Genesis 1 verses 1 - 2 = Genesis Chapter 1 Verses 1 to 2')]),
|
||||||
|
'|'.join([
|
||||||
|
translate('BiblesPlugin', '-',
|
||||||
|
'range identifier e.g. Genesis 1 verse 1 - 2 = Genesis Chapter 1 Verses 1 To 2'),
|
||||||
|
translate('BiblesPlugin', 'to',
|
||||||
|
'range identifier e.g. Genesis 1 verse 1 - 2 = Genesis Chapter 1 Verses 1 To 2')]),
|
||||||
|
'|'.join([
|
||||||
|
translate('BiblesPlugin', ',', 'connecting identifier e.g. Genesis 1 verse 1 - 2, 4 - 5 = '
|
||||||
|
'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5'),
|
||||||
|
translate('BiblesPlugin', 'and', 'connecting identifier e.g. Genesis 1 verse 1 - 2 and 4 - 5 = '
|
||||||
|
'Genesis Chapter 1 Verses 1 To 2 And Verses 4 To 5')]),
|
||||||
|
'|'.join([translate('BiblesPlugin', 'end', 'ending identifier e.g. Genesis 1 verse 1 - end = '
|
||||||
|
'Genesis Chapter 1 Verses 1 To The Last Verse')])]
|
||||||
settings = Settings()
|
settings = Settings()
|
||||||
settings.beginGroup('bibles')
|
settings.beginGroup('bibles')
|
||||||
custom_separators = [
|
custom_separators = [
|
||||||
|
@ -371,7 +371,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
"""
|
"""
|
||||||
self.application.set_normal_cursor()
|
self.application.set_normal_cursor()
|
||||||
self.load_list(files, target_group)
|
self.load_list(files, target_group)
|
||||||
last_dir = os.path.split(str(files[0]))[0]
|
last_dir = os.path.split(files[0])[0]
|
||||||
Settings().setValue(self.settings_section + '/last directory', last_dir)
|
Settings().setValue(self.settings_section + '/last directory', last_dir)
|
||||||
|
|
||||||
def load_list(self, images, target_group=None, initial_load=False):
|
def load_list(self, images, target_group=None, initial_load=False):
|
||||||
@ -535,7 +535,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
if not items:
|
if not items:
|
||||||
return False
|
return False
|
||||||
# Determine service item title
|
# Determine service item title
|
||||||
if isinstance(items[0].data(0, QtCore.Qt.UserRole), ImageGroups):
|
if isinstance(items[0].data(0, QtCore.Qt.UserRole), ImageGroups) or len(items) == 1:
|
||||||
service_item.title = items[0].text(0)
|
service_item.title = items[0].text(0)
|
||||||
else:
|
else:
|
||||||
service_item.title = str(self.plugin.name_strings['plural'])
|
service_item.title = str(self.plugin.name_strings['plural'])
|
||||||
|
@ -1,14 +1,7 @@
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* OpenLP - Open Source Lyrics Projection *
|
* OpenLP - Open Source Lyrics Projection *
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* Copyright (c) 2008-2015 Raoul Snyman *
|
* Copyright (c) 2008-2015 OpenLP Developers *
|
||||||
* Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan *
|
|
||||||
* Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, *
|
|
||||||
* Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. *
|
|
||||||
* Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, *
|
|
||||||
* Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
|
|
||||||
* Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, *
|
|
||||||
* Frode Woldsund, Martin Zibricky *
|
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* This program is free software; you can redistribute it and/or modify it *
|
* This program is free software; you can redistribute it and/or modify it *
|
||||||
* under the terms of the GNU General Public License as published by the Free *
|
* under the terms of the GNU General Public License as published by the Free *
|
||||||
|
@ -1,14 +1,7 @@
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* OpenLP - Open Source Lyrics Projection *
|
* OpenLP - Open Source Lyrics Projection *
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* Copyright (c) 2008-2015 Raoul Snyman *
|
* Copyright (c) 2008-2015 OpenLP Developers *
|
||||||
* Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan *
|
|
||||||
* Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, *
|
|
||||||
* Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. *
|
|
||||||
* Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, *
|
|
||||||
* Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
|
|
||||||
* Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, *
|
|
||||||
* Frode Woldsund, Martin Zibricky *
|
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* This program is free software; you can redistribute it and/or modify it *
|
* This program is free software; you can redistribute it and/or modify it *
|
||||||
* under the terms of the GNU General Public License as published by the Free *
|
* under the terms of the GNU General Public License as published by the Free *
|
||||||
|
@ -1,14 +1,7 @@
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* OpenLP - Open Source Lyrics Projection *
|
* OpenLP - Open Source Lyrics Projection *
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* Copyright (c) 2008-2015 Raoul Snyman *
|
* Copyright (c) 2008-2015 OpenLP Developers *
|
||||||
* Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan *
|
|
||||||
* Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, *
|
|
||||||
* Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. *
|
|
||||||
* Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, *
|
|
||||||
* Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
|
|
||||||
* Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, *
|
|
||||||
* Frode Woldsund, Martin Zibricky *
|
|
||||||
* --------------------------------------------------------------------------- *
|
* --------------------------------------------------------------------------- *
|
||||||
* This program is free software; you can redistribute it and/or modify it *
|
* This program is free software; you can redistribute it and/or modify it *
|
||||||
* under the terms of the GNU General Public License as published by the Free *
|
* under the terms of the GNU General Public License as published by the Free *
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -504,7 +504,18 @@ class OpenLyrics(object):
|
|||||||
for author in properties.authors.author:
|
for author in properties.authors.author:
|
||||||
display_name = self._text(author)
|
display_name = self._text(author)
|
||||||
author_type = author.get('type', '')
|
author_type = author.get('type', '')
|
||||||
|
# As of 0.8 OpenLyrics supports these 3 author types
|
||||||
|
if author_type not in ('words', 'music', 'translation'):
|
||||||
|
author_type = ''
|
||||||
if display_name:
|
if display_name:
|
||||||
|
# Check if an author is listed for both music and words. In that case we use a special type
|
||||||
|
if author_type == 'words' and (display_name, 'music') in authors:
|
||||||
|
authors.remove((display_name, 'music'))
|
||||||
|
authors.append((display_name, 'words+music'))
|
||||||
|
elif author_type == 'music' and (display_name, 'words') in authors:
|
||||||
|
authors.remove((display_name, 'words'))
|
||||||
|
authors.append((display_name, 'words+music'))
|
||||||
|
else:
|
||||||
authors.append((display_name, author_type))
|
authors.append((display_name, author_type))
|
||||||
for (display_name, author_type) in authors:
|
for (display_name, author_type) in authors:
|
||||||
author = self.manager.get_object_filtered(Author, Author.display_name == display_name)
|
author = self.manager.get_object_filtered(Author, Author.display_name == display_name)
|
||||||
|
4721
resources/i18n/af.ts
4721
resources/i18n/af.ts
File diff suppressed because it is too large
Load Diff
4955
resources/i18n/cs.ts
4955
resources/i18n/cs.ts
File diff suppressed because it is too large
Load Diff
4663
resources/i18n/da.ts
4663
resources/i18n/da.ts
File diff suppressed because it is too large
Load Diff
4064
resources/i18n/de.ts
4064
resources/i18n/de.ts
File diff suppressed because it is too large
Load Diff
4743
resources/i18n/el.ts
4743
resources/i18n/el.ts
File diff suppressed because it is too large
Load Diff
3755
resources/i18n/en.ts
3755
resources/i18n/en.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
4555
resources/i18n/es.ts
4555
resources/i18n/es.ts
File diff suppressed because it is too large
Load Diff
4515
resources/i18n/et.ts
4515
resources/i18n/et.ts
File diff suppressed because it is too large
Load Diff
4175
resources/i18n/fi.ts
4175
resources/i18n/fi.ts
File diff suppressed because it is too large
Load Diff
4719
resources/i18n/fr.ts
4719
resources/i18n/fr.ts
File diff suppressed because it is too large
Load Diff
3831
resources/i18n/hu.ts
3831
resources/i18n/hu.ts
File diff suppressed because it is too large
Load Diff
3753
resources/i18n/id.ts
3753
resources/i18n/id.ts
File diff suppressed because it is too large
Load Diff
4028
resources/i18n/ja.ts
4028
resources/i18n/ja.ts
File diff suppressed because it is too large
Load Diff
4354
resources/i18n/nb.ts
4354
resources/i18n/nb.ts
File diff suppressed because it is too large
Load Diff
4571
resources/i18n/nl.ts
4571
resources/i18n/nl.ts
File diff suppressed because it is too large
Load Diff
4138
resources/i18n/pl.ts
4138
resources/i18n/pl.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
4747
resources/i18n/ru.ts
4747
resources/i18n/ru.ts
File diff suppressed because it is too large
Load Diff
4461
resources/i18n/sk.ts
4461
resources/i18n/sk.ts
File diff suppressed because it is too large
Load Diff
4458
resources/i18n/sv.ts
4458
resources/i18n/sv.ts
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1
setup.py
1
setup.py
@ -1,4 +1,3 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
|
@ -35,9 +35,9 @@ import sys
|
|||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
|
||||||
if sys.version_info[1] >= 3:
|
if sys.version_info[1] >= 3:
|
||||||
from unittest.mock import MagicMock, patch, mock_open, call
|
from unittest.mock import ANY, MagicMock, patch, mock_open, call
|
||||||
else:
|
else:
|
||||||
from mock import MagicMock, patch, mock_open, call
|
from mock import ANY, MagicMock, patch, mock_open, call
|
||||||
|
|
||||||
# Only one QApplication can be created. Use QtGui.QApplication.instance() when you need to "create" a QApplication.
|
# Only one QApplication can be created. Use QtGui.QApplication.instance() when you need to "create" a QApplication.
|
||||||
application = QtGui.QApplication([])
|
application = QtGui.QApplication([])
|
||||||
|
@ -29,7 +29,7 @@ PREREQUISITE: add_record() and get_all() functions validated.
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from tests.functional import MagicMock, patch
|
from tests.functional import MagicMock, patch
|
||||||
|
|
||||||
from openlp.core.lib.projector.db import Projector, ProjectorDB
|
from openlp.core.lib.projector.db import Projector, ProjectorDB, ProjectorSource
|
||||||
|
|
||||||
from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA
|
from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST3_DATA
|
||||||
|
|
||||||
@ -49,6 +49,17 @@ def compare_data(one, two):
|
|||||||
one.notes == two.notes
|
one.notes == two.notes
|
||||||
|
|
||||||
|
|
||||||
|
def compare_source(one, two):
|
||||||
|
"""
|
||||||
|
Verify two ProjectorSource instances contain the same data
|
||||||
|
"""
|
||||||
|
return one is not None and \
|
||||||
|
two is not None and \
|
||||||
|
one.projector_id == two.projector_id and \
|
||||||
|
one.code == two.code and \
|
||||||
|
one.text == two.text
|
||||||
|
|
||||||
|
|
||||||
def add_records(self, test):
|
def add_records(self, test):
|
||||||
"""
|
"""
|
||||||
Add record if not in database
|
Add record if not in database
|
||||||
@ -151,3 +162,20 @@ class TestProjectorDB(TestCase):
|
|||||||
# THEN: Record ID should remain the same, but data should be changed
|
# THEN: Record ID should remain the same, but data should be changed
|
||||||
self.assertEqual(record_id, record.id, 'Edited record should have the same ID')
|
self.assertEqual(record_id, record.id, 'Edited record should have the same ID')
|
||||||
self.assertTrue(compare_data(TEST3_DATA, record), 'Edited record should have new data')
|
self.assertTrue(compare_data(TEST3_DATA, record), 'Edited record should have new data')
|
||||||
|
|
||||||
|
def source_add_test(self):
|
||||||
|
"""
|
||||||
|
Test source entry for projector item
|
||||||
|
"""
|
||||||
|
# GIVEN: Record entries in database
|
||||||
|
self.projector.add_projector(TEST1_DATA)
|
||||||
|
item = self.projector.get_projector_by_id(TEST1_DATA.id)
|
||||||
|
item_id = item.id
|
||||||
|
|
||||||
|
# WHEN: A source entry is saved for item
|
||||||
|
source = ProjectorSource(projector_id=item_id, code='11', text='First RGB source')
|
||||||
|
self.projector.add_source(source)
|
||||||
|
|
||||||
|
# THEN: Projector should have the same source entry
|
||||||
|
item = self.projector.get_projector_by_id(item_id)
|
||||||
|
self.assertTrue(compare_source(item.source_list[0], source))
|
||||||
|
@ -24,13 +24,38 @@ This module contains tests for the lib submodule of the Bibles plugin.
|
|||||||
"""
|
"""
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from openlp.plugins.bibles import lib
|
||||||
from openlp.plugins.bibles.lib import SearchResults
|
from openlp.plugins.bibles.lib import SearchResults
|
||||||
|
from tests.functional import MagicMock, patch
|
||||||
|
|
||||||
|
|
||||||
class TestLib(TestCase):
|
class TestLib(TestCase):
|
||||||
"""
|
"""
|
||||||
Test the functions in the :mod:`lib` module.
|
Test the functions in the :mod:`lib` module.
|
||||||
"""
|
"""
|
||||||
|
def get_reference_separator_test(self):
|
||||||
|
"""
|
||||||
|
Test the get_reference_separator method
|
||||||
|
"""
|
||||||
|
# GIVEN: A list of expected separators
|
||||||
|
separators = {'sep_r': '\\s*(?:e)\\s*', 'sep_e_default': 'end', 'sep_v_display': 'w', 'sep_l_display': 'r',
|
||||||
|
'sep_v_default': ':|v|V|verse|verses', 'sep_l': '\\s*(?:r)\\s*', 'sep_l_default': ',|and',
|
||||||
|
'sep_e': '\\s*(?:t)\\s*', 'sep_v': '\\s*(?:w)\\s*', 'sep_r_display': 'e', 'sep_r_default': '-|to'}
|
||||||
|
|
||||||
|
def side_effect():
|
||||||
|
lib.REFERENCE_SEPARATORS = separators
|
||||||
|
|
||||||
|
with patch('openlp.plugins.bibles.lib.update_reference_separators',
|
||||||
|
**{'side_effect': side_effect}) as mocked_update_reference_separators:
|
||||||
|
|
||||||
|
# WHEN: Calling get_reference_separator
|
||||||
|
for key, value in separators.items():
|
||||||
|
ret = lib.get_reference_separator(key)
|
||||||
|
|
||||||
|
# THEN: get_reference_separator should return the correct separator
|
||||||
|
self.assertEqual(separators[key], value)
|
||||||
|
mocked_update_reference_separators.assert_called_once_with()
|
||||||
|
|
||||||
def search_results_creation_test(self):
|
def search_results_creation_test(self):
|
||||||
"""
|
"""
|
||||||
Test the creation and construction of the SearchResults class
|
Test the creation and construction of the SearchResults class
|
||||||
|
@ -27,7 +27,7 @@ from unittest import TestCase
|
|||||||
from openlp.core.common import Registry
|
from openlp.core.common import Registry
|
||||||
from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
|
from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
|
||||||
from openlp.plugins.images.lib.mediaitem import ImageMediaItem
|
from openlp.plugins.images.lib.mediaitem import ImageMediaItem
|
||||||
from tests.functional import MagicMock, patch
|
from tests.functional import ANY, MagicMock, patch
|
||||||
|
|
||||||
|
|
||||||
class TestImageMediaItem(TestCase):
|
class TestImageMediaItem(TestCase):
|
||||||
@ -38,6 +38,7 @@ class TestImageMediaItem(TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.mocked_main_window = MagicMock()
|
self.mocked_main_window = MagicMock()
|
||||||
Registry.create()
|
Registry.create()
|
||||||
|
Registry().register('application', MagicMock())
|
||||||
Registry().register('service_list', MagicMock())
|
Registry().register('service_list', MagicMock())
|
||||||
Registry().register('main_window', self.mocked_main_window)
|
Registry().register('main_window', self.mocked_main_window)
|
||||||
Registry().register('live_controller', MagicMock())
|
Registry().register('live_controller', MagicMock())
|
||||||
@ -45,6 +46,43 @@ class TestImageMediaItem(TestCase):
|
|||||||
with patch('openlp.plugins.images.lib.mediaitem.MediaManagerItem._setup'), \
|
with patch('openlp.plugins.images.lib.mediaitem.MediaManagerItem._setup'), \
|
||||||
patch('openlp.plugins.images.lib.mediaitem.ImageMediaItem.setup_item'):
|
patch('openlp.plugins.images.lib.mediaitem.ImageMediaItem.setup_item'):
|
||||||
self.media_item = ImageMediaItem(None, mocked_plugin)
|
self.media_item = ImageMediaItem(None, mocked_plugin)
|
||||||
|
self.media_item.settings_section = 'images'
|
||||||
|
|
||||||
|
def validate_and_load_test(self):
|
||||||
|
"""
|
||||||
|
Test that the validate_and_load_test() method when called without a group
|
||||||
|
"""
|
||||||
|
# GIVEN: A list of files
|
||||||
|
file_list = ['/path1/image1.jpg', '/path2/image2.jpg']
|
||||||
|
|
||||||
|
with patch('openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_list') as mocked_load_list, \
|
||||||
|
patch('openlp.plugins.images.lib.mediaitem.Settings') as mocked_settings:
|
||||||
|
|
||||||
|
# WHEN: Calling validate_and_load with the list of files
|
||||||
|
self.media_item.validate_and_load(file_list)
|
||||||
|
|
||||||
|
# THEN: load_list should have been called with the file list and None,
|
||||||
|
# the directory should have been saved to the settings
|
||||||
|
mocked_load_list.assert_called_once_with(file_list, None)
|
||||||
|
mocked_settings().setValue.assert_called_once_with(ANY, '/path1')
|
||||||
|
|
||||||
|
def validate_and_load_group_test(self):
|
||||||
|
"""
|
||||||
|
Test that the validate_and_load_test() method when called with a group
|
||||||
|
"""
|
||||||
|
# GIVEN: A list of files
|
||||||
|
file_list = ['/path1/image1.jpg', '/path2/image2.jpg']
|
||||||
|
|
||||||
|
with patch('openlp.plugins.images.lib.mediaitem.ImageMediaItem.load_list') as mocked_load_list, \
|
||||||
|
patch('openlp.plugins.images.lib.mediaitem.Settings') as mocked_settings:
|
||||||
|
|
||||||
|
# WHEN: Calling validate_and_load with the list of files and a group
|
||||||
|
self.media_item.validate_and_load(file_list, 'group')
|
||||||
|
|
||||||
|
# THEN: load_list should have been called with the file list and the group name,
|
||||||
|
# the directory should have been saved to the settings
|
||||||
|
mocked_load_list.assert_called_once_with(file_list, 'group')
|
||||||
|
mocked_settings().setValue.assert_called_once_with(ANY, '/path1')
|
||||||
|
|
||||||
def save_new_images_list_empty_list_test(self):
|
def save_new_images_list_empty_list_test(self):
|
||||||
"""
|
"""
|
||||||
|
@ -66,6 +66,14 @@ result_tags = [{"temporary": False, "protected": False, "desc": "z", "start tag"
|
|||||||
"start html": "<span class=\"chord\" style=\"display:none\"><strong>", "end html": "</strong></span>",
|
"start html": "<span class=\"chord\" style=\"display:none\"><strong>", "end html": "</strong></span>",
|
||||||
"protected": False}]
|
"protected": False}]
|
||||||
|
|
||||||
|
author_xml = '<properties>\
|
||||||
|
<authors>\
|
||||||
|
<author type="words">Test Author1</author>\
|
||||||
|
<author type="music">Test Author1</author>\
|
||||||
|
<author type="words">Test Author2</author>\
|
||||||
|
</authors>\
|
||||||
|
</properties>'
|
||||||
|
|
||||||
|
|
||||||
class TestOpenLyricsImport(TestCase, TestMixin):
|
class TestOpenLyricsImport(TestCase, TestMixin):
|
||||||
"""
|
"""
|
||||||
@ -139,3 +147,22 @@ class TestOpenLyricsImport(TestCase, TestMixin):
|
|||||||
self.assertListEqual(json.loads(json.dumps(result_tags)),
|
self.assertListEqual(json.loads(json.dumps(result_tags)),
|
||||||
json.loads(str(Settings().value('formattingTags/html_tags'))),
|
json.loads(str(Settings().value('formattingTags/html_tags'))),
|
||||||
'The formatting tags should contain both the old and the new')
|
'The formatting tags should contain both the old and the new')
|
||||||
|
|
||||||
|
def process_author_test(self):
|
||||||
|
"""
|
||||||
|
Test that _process_authors works
|
||||||
|
"""
|
||||||
|
# GIVEN: A OpenLyric XML with authors and a mocked out manager
|
||||||
|
with patch('openlp.plugins.songs.lib.openlyricsxml.Author') as mocked_author:
|
||||||
|
mocked_manager = MagicMock()
|
||||||
|
mocked_manager.get_object_filtered.return_value = None
|
||||||
|
ol = OpenLyrics(mocked_manager)
|
||||||
|
properties_xml = objectify.fromstring(author_xml)
|
||||||
|
mocked_song = MagicMock()
|
||||||
|
|
||||||
|
# WHEN: processing the author xml
|
||||||
|
ol._process_authors(properties_xml, mocked_song)
|
||||||
|
|
||||||
|
# THEN: add_author should have been called twice
|
||||||
|
self.assertEquals(mocked_song.method_calls[0][1][1], 'words+music')
|
||||||
|
self.assertEquals(mocked_song.method_calls[1][1][1], 'words')
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -4,14 +4,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2013 Raoul Snyman #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
|
||||||
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
|
||||||
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
@ -5,13 +5,6 @@
|
|||||||
# OpenLP - Open Source Lyrics Projection #
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# Copyright (c) 2008-2015 OpenLP Developers #
|
# Copyright (c) 2008-2015 OpenLP Developers #
|
||||||
# Portions copyright (c) 2008-2015 Tim Bentley, Gerald Britton, Jonathan #
|
|
||||||
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
|
||||||
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
|
||||||
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
|
||||||
# Christian Richter, Philip Ridout, Ken Roberts, Simon Scudder, #
|
|
||||||
# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
|
|
||||||
# Dave Warnock, Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# This program is free software; you can redistribute it and/or modify it #
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
# under the terms of the GNU General Public License as published by the Free #
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
Loading…
Reference in New Issue
Block a user