[Openlp-core] [Bug 1798651] Re: Impress Presentation Console should be disabled by OpenLP
** Changed in: openlp Assignee: (unassigned) => Tomas Groth (tomasgroth) ** Changed in: openlp Status: Confirmed => In Progress -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1798651 Title: Impress Presentation Console should be disabled by OpenLP Status in OpenLP: In Progress Bug description: If the Impress Presentation Console/Screen is enabled, then the console will be activated when going live in OpenLP triggering some undefined behaviour. Therefore OpenLP should try to disable this if it is enabled. This should be possible using the API. Code samples for configuration can be found here https://opengrok.libreoffice.org/search?project=core&q=ConfigurationProvider&defs=&refs=&path=&hist=&type=python The config node is called EnablePresenterScreen, here is cpp code reading that property https://opengrok.libreoffice.org/xref/core/sdext/source/presenter/PresenterScreen.cxx#278 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1798651/+subscriptions ___ 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] [Bug 1798651] Re: Impress Presentation Console should be disabled by OpenLP
** Branch linked: lp:~tomasgroth/openlp/presentation-beyond-last -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1798651 Title: Impress Presentation Console should be disabled by OpenLP Status in OpenLP: In Progress Bug description: If the Impress Presentation Console/Screen is enabled, then the console will be activated when going live in OpenLP triggering some undefined behaviour. Therefore OpenLP should try to disable this if it is enabled. This should be possible using the API. Code samples for configuration can be found here https://opengrok.libreoffice.org/search?project=core&q=ConfigurationProvider&defs=&refs=&path=&hist=&type=python The config node is called EnablePresenterScreen, here is cpp code reading that property https://opengrok.libreoffice.org/xref/core/sdext/source/presenter/PresenterScreen.cxx#278 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1798651/+subscriptions ___ 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:~bastian-germann/openlp/depends into lp:openlp
But if you do not have a defined set of mandatory packages you would have to insert suh a check for every non-core-python package that you import. What an ugly code would that make for! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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:~bastian-germann/openlp/depends into lp:openlp
No, the package can be removed even though you have setup.py which only you use. Packages can be removed by accident and then will go bang. Please do not change code which is fitting to a supported defensive pattern. -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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:~bastian-germann/openlp/depends into lp:openlp
Why do they break OpenLP? pymediainfo is marked in setup.py as mandatory dependency. Or do you mean the i18n string? -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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:~bastian-germann/openlp/depends into lp:openlp
Review: Needs Fixing
Please remove the video code changes as they break OpenLP and do not provide an
acceptable user experience.
Diff comments:
> === modified file 'openlp/core/ui/media/mediacontroller.py'
> --- openlp/core/ui/media/mediacontroller.py 2019-02-14 15:09:09 +
> +++ openlp/core/ui/media/mediacontroller.py 2019-04-02 17:19:11 +
> @@ -26,13 +26,8 @@
> import datetime
> import logging
>
> -try:
> -from pymediainfo import MediaInfo
> -pymediainfo_available = True
> -except ImportError:
> -pymediainfo_available = False
> -
> from subprocess import check_output
> +from pymediainfo import MediaInfo
This crashes the code with a stack trace and does not give an error message,
> from PyQt5 import QtCore, QtWidgets
>
> from openlp.core.state import State
> @@ -168,11 +163,11 @@
> self.setup()
> self.vlc_player = VlcPlayer(self)
> State().add_service("mediacontroller", 0)
> -if get_vlc() and pymediainfo_available:
> +if get_vlc():
> State().update_pre_conditions("mediacontroller", True)
> else:
> State().missing_text("mediacontroller",
> translate('OpenLP.SlideController',
> - "VLC or pymediainfo are missing, so you are
> unable to play any media"))
This does not give the correct message to the user about errors gracefully
providing errors and allowing them to continue degraded.
> + "VLC is missing, so you are unable to play
> any media"))
> self._generate_extensions_lists()
> return True
>
--
https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421
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:~bastian-germann/openlp/depends into lp:openlp
Instead of running python3 -m pytest in MP-04-macOS-Tests it could be changed to python3 setup.py test. This would take care of any dependencies and they would not have to be installed manually every time a dependency changes. -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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] macOS Test Results: Failed
macOS tests failed, please see https://ci.openlp.io/job/MP-04-macOS-Tests/51/ for more details -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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] Linting: Passed
Linting passed! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421 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:~bastian-germann/openlp/depends into lp:openlp
Bastian Germann has proposed merging lp:~bastian-germann/openlp/depends into
lp:openlp.
Commit message:
Improve dependency handling including PEP508 Environment Markers and using the
library provided by pymediainfo for Windows tests
Requested reviews:
Phill (phill-ridout)
Tomas Groth (tomasgroth)
For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365421
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-02 17:19:11 +
@@ -26,13 +26,8 @@
import datetime
import logging
-try:
-from pymediainfo import MediaInfo
-pymediainfo_available = True
-except ImportError:
-pymediainfo_available = False
-
from subprocess import check_output
+from pymediainfo import MediaInfo
from PyQt5 import QtCore, QtWidgets
from openlp.core.state import State
@@ -168,11 +163,11 @@
self.setup()
self.vlc_player = VlcPlayer(self)
State().add_service("mediacontroller", 0)
-if get_vlc() and pymediainfo_available:
+if get_vlc():
State().update_pre_conditions("mediacontroller", True)
else:
State().missing_text("mediacontroller", translate('OpenLP.SlideController',
- "VLC or pymediainfo are missing, so you are unable to play any media"))
+ "VLC is missing, so you are unable to play any media"))
self._generate_extensions_lists()
return True
=== modified file 'scripts/appveyor.yml'
--- scripts/appveyor.yml 2019-03-04 20:32:05 +
+++ scripts/appveyor.yml 2019-04-02 17:19:11 +
@@ -21,11 +21,6 @@
- appveyor DownloadFile https://mupdf.com/downloads/archive/mupdf-1.14.0-windows.zip
- 7z x mupdf-1.14.0-windows.zip
- cp mupdf-1.14.0-windows/mutool.exe openlp-branch/mutool.exe
- # Download and unpack mediainfo
- - appveyor DownloadFile https://mediaarea.net/download/binary/mediainfo/18.08.1/MediaInfo_CLI_18.08.1_Windows_i386.zip
- - mkdir MediaInfo
- - 7z x -oMediaInfo MediaInfo_CLI_18.08.1_Windows_i386.zip
- - cp MediaInfo\\MediaInfo.exe openlp-branch\\MediaInfo.exe
build: off
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2019-02-14 15:09:09 +
+++ scripts/check_dependencies.py 2019-04-02 17:19:11 +
@@ -40,8 +40,8 @@
VERS = {
'Python': '3.6',
-'PyQt5': '5.5',
-'Qt5': '5.5',
+'PyQt5': '5.12',
+'Qt5': '5.9',
'pymediainfo': '2.2',
'sqlalchemy': '0.5',
'enchant': '1.6'
@@ -57,6 +57,7 @@
LINUX_MODULES = [
# Optical drive detection.
'dbus',
+'Xlib',
]
MACOSX_MODULES = [
@@ -93,6 +94,7 @@
OPTIONAL_MODULES = [
+('qdarkstyle', '(dark style support)'),
('mysql.connector', '(MySQL support)'),
('pyodbc', '(ODBC support)'),
('psycopg2', '(PostgreSQL support)'),
=== modified file 'setup.py'
--- setup.py 2019-03-28 21:03:32 +
+++ setup.py 2019-04-02 17:19:11 +
@@ -22,7 +22,6 @@
###
import re
-import sys
from subprocess import Popen, PIPE
from setuptools import setup, find_packages
@@ -112,40 +111,6 @@
finally:
ver_file.close()
-requires = [
-'alembic',
-'appdirs',
-'beautifulsoup4',
-'chardet',
-'lxml',
-'Mako',
-'pymediainfo >= 2.2',
-'PyQt5 >= 5.12',
-'PyQtWebEngine',
-'QtAwesome',
-'requests',
-'SQLAlchemy >= 0.5',
-'waitress',
-'WebOb',
-'websockets'
-]
-test_requires = [
-'nose2',
-'pylint',
-'pyodbc',
-'pysword'
-]
-if sys.platform.startswith('win'):
-requires.append('pywin32')
-elif sys.platform.startswith('darwin'):
-requires.extend([
-'pyobjc',
-'pyobjc-framework-Cocoa'
-])
-elif sys.platform.startswith('linux'):
-requires.append('dbus-python')
-test_requires.append('xlib')
-
setup(
name='OpenLP',
@@ -200,8 +165,29 @@
include_package_data=True,
zip_safe=False,
python_requires='>=3.6',
-install_requires=requires,
+install_requires=[
+'alembic',
+'appdirs',
+'beautifulsoup4',
+'chardet',
+'dbus-python; platform_system=="Linux"',
+'lxml',
+'Mako',
+'pymediainfo >= 2.2',
+'pyobjc; platform_system=="Darwin"',
+'pyobjc-framework-Cocoa; platform_system=="Darwin"',
+'PyQt5 >= 5.12',
+'PyQtWebEngine',
+'pywin32; platform_system=="Windows"',
+'QtAwesome',
+'requests',
+'SQLAlchemy >= 0.5',
+'waitress',
+'WebOb',
+'websockets'
+],
extras_require={
+'darkstyle': ['QDarkStyle'],
'mysql': ['mysql-connector-python'],
'odbc': ['pyodbc'],
'postgresql': ['psycopg2'],
@@ -211,
[Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
The proposal to merge lp:~bastian-germann/openlp/depends into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365379 -- 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:~bastian-germann/openlp/depends into lp:openlp
openlp/core/ui/style.py uses qdarkstyle. -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365379 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:~bastian-germann/openlp/depends into lp:openlp
Review: Needs Fixing
See inline comment about wrong minimum version of Qt
Diff comments:
>
> === modified file 'scripts/check_dependencies.py'
> --- scripts/check_dependencies.py 2019-02-14 15:09:09 +
> +++ scripts/check_dependencies.py 2019-04-02 00:15:48 +
> @@ -40,8 +40,8 @@
>
> VERS = {
> 'Python': '3.6',
> -'PyQt5': '5.5',
> -'Qt5': '5.5',
> +'PyQt5': '5.12',
> +'Qt5': '5.12',
The minimum version should be the version supported by the latest Ubuntu LTS
(18.04) and the fedora equivalent. For Ububtu 18.04, this is Qt 5.10 !
> 'pymediainfo': '2.2',
> 'sqlalchemy': '0.5',
> 'enchant': '1.6'
--
https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365379
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:~bastian-germann/openlp/depends into lp:openlp
Review: Needs Fixing As noted above there is some lint errors that must be fixed. I noticed you imported qdarkstyle, but it is not used anywhere? I assume it must be activated using a new setting? (I admit I have not run this branch) -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365379 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
