openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

lint fixes

This commit is contained in:
Tomas Groth 2024-03-28 22:56:20 +01:00
parent c95d75e1f3
commit 39b5277133
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/api/versions/v1/core.py
View File

@ -57,6 +57,7 @@ def plugin_list():
def main_image():
live_controller = Registry().get('live_controller')
img_data = live_controller.staticMetaObject.invokeMethod(
live_controller, 'grab_maindisplay', QtCore.Qt.ConnectionType.BlockingQueuedConnection, QtCore.Q_RETURN_ARG(str))
live_controller, 'grab_maindisplay', QtCore.Qt.ConnectionType.BlockingQueuedConnection,
QtCore.Q_RETURN_ARG(str))
img = 'data:image/jpeg;base64,{}'.format(img_data)
return jsonify({'slide_image': img})

10
openlp/core/app.py
View File

@ -474,12 +474,10 @@ def main():
qt_args.extend(['-platform', 'windows:darkmode=1'])
elif is_macosx() and getattr(sys, 'frozen', False) and not os.environ.get('QTWEBENGINEPROCESS_PATH'):
# Set the location to the QtWebEngineProcess binary, normally set by PyInstaller, but it moves around...
os.environ['QTWEBENGINEPROCESS_PATH'] = str((AppLocation.get_directory(AppLocation.AppDir) / 'PySide6' / 'Qt6' /
'lib' / 'QtWebEngineCore.framework' / 'Versions' / '6' /
'Helpers' / 'QtWebEngineProcess.app' / 'Contents' / 'MacOS' /
'QtWebEngineProcess').resolve())
no_custom_factor_rounding = not ('QT_SCALE_FACTOR_ROUNDING_POLICY' in os.environ
and bool(os.environ['QT_SCALE_FACTOR_ROUNDING_POLICY'].strip()))
os.environ['QTWEBENGINEPROCESS_PATH'] = str((AppLocation.get_directory(AppLocation.AppDir) / 'PySide6' /
'Qt6' / 'lib' / 'QtWebEngineCore.framework' / 'Versions' /
'6' / 'Helpers' / 'QtWebEngineProcess.app' / 'Contents' /
'MacOS' / 'QtWebEngineProcess').resolve())
# Prevent the use of wayland, use xcb instead
if is_wayland_compositor():
qt_args.extend(['-platform', 'xcb'])