[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-t into lp:openlp

2018-10-24 Thread noreply 
The proposal to merge lp:~alisonken1/openlp/pjlink2-t into lp:openlp has been 
updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/357428
-- 
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-t into lp:openlp

2018-10-24 Thread Tomas Groth 
Review: Approve


-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/357428
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-t into lp:openlp

2018-10-20 Thread Tim Bentley 
Review: Approve


-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/357428
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:~alisonken1/openlp/pjlink2-t into lp:openlp

2018-10-19 Thread Ken Roberts 
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-t into lp:openlp.

Commit message:
PJLink2 Update T


lp:~alisonken1/openlp/pjlink2-t (revision 2835)
https://ci.openlp.io/job/Branch-01-Pull/2587/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2485/  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/263/   [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/168/  [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/147/   [FAILURE]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1630/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1443/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/340/ [FAILURE]


Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/357428

- Move tests/functional/openlp_core/common/test_networkinterfaces.py to 
tests/openlp_core/common
- Minor cleanups in openlp.core.common.__init__.get_local_ip4()
- Add more get_local_ip4 tests
- Fix some oops in ProjectorManager when add/edit projector entry
- Update tests/openlp_core/projectors/test_projector_pjlink_udp.py with correct 
log entries
- Add tests to tests/openlp/core/projectors/test_projector_pjlink_udp
- Add UDP 'projector/udp broadcast listen' status in Settings() (default=False)
- Add UDP broadcast listen option in projector settings tab
- pep8 cleanup in tests/functional/openlp_core/common/test_i18n.py
- pep8 cleanup in openlp/core/lib/__init__.py
- Add check_settings(), udp_start(), and udp_stop() methods in PJLinkUDP
- Add add_udp_listener(), remove_udp_listener(), call_udp_listener() methods to 
projector settings tab

-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~alisonken1/openlp/pjlink2-t into lp:openlp.
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2018-08-03 22:32:32 +
+++ openlp/core/common/__init__.py	2018-10-20 04:41:58 +
@@ -60,7 +60,6 @@
 
 :returns: Dict of interfaces
 """
-# Get the local IPv4 active address(es) that are NOT localhost (lo or '127.0.0.1')
 log.debug('Getting local IPv4 interface(es) information')
 my_ip4 = {}
 for iface in QNetworkInterface.allInterfaces():
@@ -70,8 +69,6 @@
 log.debug('Checking address(es) protocol')
 for address in iface.addressEntries():
 ip = address.ip()
-# NOTE: Next line will skip if interface is localhost - keep for now until we decide about it later
-# if (ip.protocol() == QAbstractSocket.IPv4Protocol) and (ip != QHostAddress.LocalHost):
 log.debug('Checking for protocol == IPv4Protocol')
 if ip.protocol() == QAbstractSocket.IPv4Protocol:
 log.debug('Getting interface information')
@@ -83,12 +80,13 @@
  ip.toIPv4Address()).toString()
 }
 log.debug('Adding {iface} to active list'.format(iface=iface.name()))
+if len(my_ip4) == 0:
+log.warning('No active IPv4 network interfaces detected')
+return my_ip4
 if 'localhost' in my_ip4:
 log.debug('Renaming windows localhost to lo')
 my_ip4['lo'] = my_ip4['localhost']
 my_ip4.pop('localhost')
-if len(my_ip4) == 0:
-log.warning('No active IPv4 network interfaces detected')
 if len(my_ip4) == 1:
 if 'lo' in my_ip4:
 # No active interfaces - so leave localhost in there

=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py	2018-06-07 17:44:35 +
+++ openlp/core/common/settings.py	2018-10-20 04:41:58 +
@@ -217,7 +217,8 @@
 'projector/last directory export': None,
 'projector/poll time': 20,  # PJLink  timeout is 30 seconds
 'projector/socket timeout': 5,  # 5 second socket timeout
-'projector/source dialog type': 0  # Source select dialog box type
+'projector/source dialog type': 0,  # Source select dialog box type
+'projector/udp broadcast listen': False  # Enable/disable listening for PJLink 2 UDP broadcast packets
 }
 __file_path__ = ''
 # Settings upgrades prior to 3.0

=== modified file 'openlp/core/projectors/editform.py'
--- openlp/core/projectors/editform.py	2018-04-21 19:57:51 +
+++ openlp/core/projectors/editform.py	2018-10-20 04:41:58 +
@@ -179,6 +179,7 @@
 Validate input before accepting input.
 """
 log.debug('accept_me() signal received')
+valid = True
 if len(self.name_text.text().strip()) < 1:
 QtWidgets.QMessageBox.warning(self,
   translate('OpenLP.ProjectorEdit', 'Name Not

Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-t into lp:openlp

2018-10-13 Thread Ken Roberts 
I spent some time trying to work with signals, but since signals have to be 
bound to be used, trying to get a signal connected from the projector code to 
the settings tab instance was convoluted and not as clean as the registry.

The other consideration is how often will projector instances be added/deleted 
once the system is set up and running. The only case where I could think of 
might be a portable setting but once set up should not be changing during 
service. For normal use at a church, I haven't made any changes to projector 
manager since hardware typically does not change unless building gets a 
hardware makeover.

Any suggestions would be appreciated.
-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/356677
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-t into lp:openlp

2018-10-13 Thread Tim Bentley 
Review: Needs Fixing

There should be a better way than adding and removing functions from the 
registry.
-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/356677
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:~alisonken1/openlp/pjlink2-t into lp:openlp

2018-10-13 Thread Ken Roberts 
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-t into lp:openlp.

Commit message:
PJLink2-T Update (UDP updates and some cleanups)

Having network issues - ci failed when running ci but passed when looked at 
branch webpage:

lp:~alisonken1/openlp/pjlink2-t (revision 2834)
https://ci.openlp.io/job/Branch-01-Pull/2578/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2475/  
[WAITING]Traceback (most recent call last):
...
Exception: Build has not started yet, it may be stuck in the queue
===

Jenkins branch webpage:
---
Success Branch-01-Pull (#2578)
Success Branch-02a-Linux-Tests (#2475)
Failed  Branch-02b-macOS-Tests (#249)
Success Branch-03a-Build-Source (#162)
Success Branch-03b-Build-macOS (#141)
Success Branch-04a-Code-Analysis (#1624)
Success Branch-04b-Test-Coverage (#1437)
Success Branch-04c-Lint-Check (#567)
Failed  Branch-05-AppVeyor-Tests (#336)
Failed  Branch-06-Build_API_Docs (#486)


Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/356677

- Move tests/functional/openlp_core/common/test_networkinterfaces.py to 
tests/openlp_core/common
- Minor cleanups in openlp.core.common.__init__.get_local_ip4()
- Add more get_local_ip4 tests
- Fix some oops in ProjectorManager when add/edit projector entry
- Update tests/openlp_core/projectors/test_projector_pjlink_udp.py with correct 
log entries
- Add UDP 'projector/udp broadcast listen' status in Settings() (default=False)
- Add UDP broadcast listen option in projector settings tab
- Add check_settings(), udp_start(), and udp_stop(), udp_add(), udp_delete() 
methods in PJLinkUDP
- Add Registry().register_function('udp_broadcast_listen') call for UDP 
settings update
- Add udp_listen_add(), udp_listen_delete() methods to ProjectorManager
- pep8 cleanup in tests/functional/openlp_core/common/test_i18n.py
- pep8 cleanup in openlp/core/lib/__init__.py

-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~alisonken1/openlp/pjlink2-t into lp:openlp.
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2018-08-03 22:32:32 +
+++ openlp/core/common/__init__.py	2018-10-13 12:21:32 +
@@ -60,7 +60,6 @@
 
 :returns: Dict of interfaces
 """
-# Get the local IPv4 active address(es) that are NOT localhost (lo or '127.0.0.1')
 log.debug('Getting local IPv4 interface(es) information')
 my_ip4 = {}
 for iface in QNetworkInterface.allInterfaces():
@@ -70,8 +69,6 @@
 log.debug('Checking address(es) protocol')
 for address in iface.addressEntries():
 ip = address.ip()
-# NOTE: Next line will skip if interface is localhost - keep for now until we decide about it later
-# if (ip.protocol() == QAbstractSocket.IPv4Protocol) and (ip != QHostAddress.LocalHost):
 log.debug('Checking for protocol == IPv4Protocol')
 if ip.protocol() == QAbstractSocket.IPv4Protocol:
 log.debug('Getting interface information')
@@ -83,12 +80,13 @@
  ip.toIPv4Address()).toString()
 }
 log.debug('Adding {iface} to active list'.format(iface=iface.name()))
+if len(my_ip4) == 0:
+log.warning('No active IPv4 network interfaces detected')
+return my_ip4
 if 'localhost' in my_ip4:
 log.debug('Renaming windows localhost to lo')
 my_ip4['lo'] = my_ip4['localhost']
 my_ip4.pop('localhost')
-if len(my_ip4) == 0:
-log.warning('No active IPv4 network interfaces detected')
 if len(my_ip4) == 1:
 if 'lo' in my_ip4:
 # No active interfaces - so leave localhost in there

=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py	2018-06-07 17:44:35 +
+++ openlp/core/common/settings.py	2018-10-13 12:21:32 +
@@ -217,7 +217,8 @@
 'projector/last directory export': None,
 'projector/poll time': 20,  # PJLink  timeout is 30 seconds
 'projector/socket timeout': 5,  # 5 second socket timeout
-'projector/source dialog type': 0  # Source select dialog box type
+'projector/source dialog type': 0,  # Source select dialog box type
+'projector/udp broadcast listen': False  # Enable/disable listening for PJLink 2 UDP broadcast packets
 }
 __file_path__ = ''
 # Settings upgrades prior to 3.0

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2018-08-25 14:08:19 +
+++ openlp/core/lib/__init__.py	2018-10-13 12:21:32 +
@@ -609,4 +609,4 @@

[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-t into lp:openlp

2018-08-22 Thread Ken Roberts 
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-t into lp:openlp.

Commit message:
PJLink Update T

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-t/+merge/353593

- Move tests/functional/openlp_core/common/test_networkinterfaces.py to 
tests/openlp_core/common
- Minor cleanups in openlp.core.common.__init__.get_local_ip4()
- Add more get_local_ip4 tests
- Add missing __init__.py files in projector test directories


lp:~alisonken1/openlp/pjlink2-t (revision 2829)
https://ci.openlp.io/job/Branch-01-Pull/2568/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2466/  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/247/   [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/154/  [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/139/   [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1616/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1429/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/333/ [FAILURE]


-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~alisonken1/openlp/pjlink2-t into lp:openlp.
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2018-08-03 22:32:32 +
+++ openlp/core/common/__init__.py	2018-08-22 18:09:46 +
@@ -60,7 +60,6 @@
 
 :returns: Dict of interfaces
 """
-# Get the local IPv4 active address(es) that are NOT localhost (lo or '127.0.0.1')
 log.debug('Getting local IPv4 interface(es) information')
 my_ip4 = {}
 for iface in QNetworkInterface.allInterfaces():
@@ -70,8 +69,6 @@
 log.debug('Checking address(es) protocol')
 for address in iface.addressEntries():
 ip = address.ip()
-# NOTE: Next line will skip if interface is localhost - keep for now until we decide about it later
-# if (ip.protocol() == QAbstractSocket.IPv4Protocol) and (ip != QHostAddress.LocalHost):
 log.debug('Checking for protocol == IPv4Protocol')
 if ip.protocol() == QAbstractSocket.IPv4Protocol:
 log.debug('Getting interface information')
@@ -83,12 +80,13 @@
  ip.toIPv4Address()).toString()
 }
 log.debug('Adding {iface} to active list'.format(iface=iface.name()))
+if len(my_ip4) == 0:
+log.warning('No active IPv4 network interfaces detected')
+return my_ip4
 if 'localhost' in my_ip4:
 log.debug('Renaming windows localhost to lo')
 my_ip4['lo'] = my_ip4['localhost']
 my_ip4.pop('localhost')
-if len(my_ip4) == 0:
-log.warning('No active IPv4 network interfaces detected')
 if len(my_ip4) == 1:
 if 'lo' in my_ip4:
 # No active interfaces - so leave localhost in there

=== added directory 'tests/openlp_core/common'
=== added file 'tests/openlp_core/common/__init__.py'
--- tests/openlp_core/common/__init__.py	1970-01-01 00:00:00 +
+++ tests/openlp_core/common/__init__.py	2018-08-22 18:09:46 +
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2018 OpenLP Developers   #
+# --- #
+# 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  #
+# Software Foundation; version 2 of the License.  #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or   #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for#
+# more details.   #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA  #
+###
+"""
+:mod