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

2018-04-19 Thread Ken Roberts 
The proposal to merge lp:~alisonken1/openlp/pjlink2-q into lp:openlp has been 
updated.

Status: Needs review => Superseded

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

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

Commit message:
PJLink2 update Q

Requested reviews:
  Phill (phill-ridout)
  Tim Bentley (trb143)

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

PJLink2 update Q


lp:~alisonken1/openlp/pjlink2-q (revision 2818)
https://ci.openlp.io/job/Branch-01-Pull/2504/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2405/  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/191/   [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/103/  [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/96/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1565/[FAILURE]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1378/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/309/ 
[WAITING]Traceback
--

- Fix test_projector_db:TestProjectorDBUpdate segfault by
creating self.main_window steps
- Pep8 on openlp/core/common/__init__.get_local_ip4()
- Collapse import from projector.constants from line-per-item to 
multi-items-per-line
- Change pjlink_functions to include class version for projector instance in 
command
- Set projector.editform to only allow editing IP address field for new entry 
only (used as db key entry)
- Collapse projector.manager imports from entry-per-line to compact import
- projector.pjlink:
- Merge pjlink_functions_udp into pjlink_functions
- Change pjlink_functions to add instance-specific version to commands
- Fix command checks to changed pjlink_funcions
- Update process_clss to update PJLink version in pjlink_functions
- Update reset_information to update PJLink version in pjlink_functions
- renamed test_projectorsourceform.py to test_projector_sourceform.py
- renamed test_projectoreditform.py to test_projector_editform.py
- Fix projector tests
- Fix list creation in constants (remove unneeded comma)
- Rename editform ip_text_show label to ip_text_label
- Refactor editform IP address check
- Add TODO on commented code block for breaking incoming packet into parts

-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/projectors/constants.py'
--- openlp/core/projectors/constants.py	2018-01-03 00:35:14 +
+++ openlp/core/projectors/constants.py	2018-04-20 05:55:41 +
@@ -154,110 +154,137 @@
 S_INFO
 ]
 
-# NOTE: Changed format to account for some commands are both class 1 and 2
+# NOTE: Changed format to account for some commands are both class 1 and 2.
+#   Make sure the sequence of 'version' is lowest-to-highest.
 PJLINK_VALID_CMD = {
-'ACKN': {'version': ['2', ],
+'ACKN': {'version': ['2'],
+ 'default': '2',
  'description': translate('OpenLP.PJLinkConstants',
   'Acknowledge a PJLink SRCH command - returns MAC address.')
  },
-'AVMT': {'version': ['1', ],
+'AVMT': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Blank/unblank video and/or mute audio.')
  },
-'CLSS': {'version': ['1', ],
+'CLSS': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query projector PJLink class support.')
  },
 'ERST': {'version': ['1', '2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query error status from projector. '
   'Returns fan/lamp/temp/cover/filter/other error status.')
  },
-'FILT': {'version': ['2', ],
+'FILT': {'version': ['2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query number of hours on filter.')
  },
-'FREZ': {'version': ['2', ],
+'FREZ': {'version': ['2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Freeze or unfreeze current image being projected.')
  },
-'INF1': {'version': ['1', ],
+'INF1': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query projector manufacturer name.')
  },
-'INF2': {'version': ['1', ],
+'INF2': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',

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

2018-04-19 Thread Ken Roberts 
The proposal to merge lp:~alisonken1/openlp/pjlink2-q into lp:openlp has been 
updated.

Status: Needs review => Superseded

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

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

Commit message:
PJLink2 update Q

Requested reviews:
  Tim Bentley (trb143)
  Phill (phill-ridout)

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

PJLink2 update Q



lp:~alisonken1/openlp/pjlink2-q (revision 2818)
https://ci.openlp.io/job/Branch-01-Pull/2506/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2407/  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/193/   [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/105/  [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/98/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1567/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1380/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/309/ [FAILURE]

--

- Fix test_projector_db:TestProjectorDBUpdate segfault by
creating self.main_window steps
- Pep8 on openlp/core/common/__init__.get_local_ip4()
- Collapse import from projector.constants from line-per-item to 
multi-items-per-line
- Change pjlink_functions to include class version for projector instance in 
command
- Set projector.editform to only allow editing IP address field for new entry 
only (used as db key entry)
- Collapse projector.manager imports from entry-per-line to compact import
- projector.pjlink:
- Merge pjlink_functions_udp into pjlink_functions
- Change pjlink_functions to add instance-specific version to commands
- Fix command checks to changed pjlink_funcions
- Update process_clss to update PJLink version in pjlink_functions
- Update reset_information to update PJLink version in pjlink_functions
- renamed test_projectorsourceform.py to test_projector_sourceform.py
- renamed test_projectoreditform.py to test_projector_editform.py
- Fix projector tests
- Fix list creation in constants (remove unneeded comma)
- Rename editform ip_text_show label to ip_text_label
- Refactor editform IP address check
- Add TODO on commented code block for breaking incoming packet into parts

-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/projectors/constants.py'
--- openlp/core/projectors/constants.py	2018-01-03 00:35:14 +
+++ openlp/core/projectors/constants.py	2018-04-20 06:16:23 +
@@ -154,110 +154,137 @@
 S_INFO
 ]
 
-# NOTE: Changed format to account for some commands are both class 1 and 2
+# NOTE: Changed format to account for some commands are both class 1 and 2.
+#   Make sure the sequence of 'version' is lowest-to-highest.
 PJLINK_VALID_CMD = {
-'ACKN': {'version': ['2', ],
+'ACKN': {'version': ['2'],
+ 'default': '2',
  'description': translate('OpenLP.PJLinkConstants',
   'Acknowledge a PJLink SRCH command - returns MAC address.')
  },
-'AVMT': {'version': ['1', ],
+'AVMT': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Blank/unblank video and/or mute audio.')
  },
-'CLSS': {'version': ['1', ],
+'CLSS': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query projector PJLink class support.')
  },
 'ERST': {'version': ['1', '2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query error status from projector. '
   'Returns fan/lamp/temp/cover/filter/other error status.')
  },
-'FILT': {'version': ['2', ],
+'FILT': {'version': ['2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query number of hours on filter.')
  },
-'FREZ': {'version': ['2', ],
+'FREZ': {'version': ['2'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Freeze or unfreeze current image being projected.')
  },
-'INF1': {'version': ['1', ],
+'INF1': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',
   'Query projector manufacturer name.')
  },
-'INF2': {'version': ['1', ],
+'INF2': {'version': ['1'],
+ 'default': '1',
  'description': translate('OpenLP.PJLinkConstants',