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

Figured out what my problem was -- black text on a black background

This commit is contained in:
Raoul Snyman 2018-03-24 17:31:12 -07:00
parent 7f0d4c635f
commit 552dc60d21
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/display/html/display.html
View File

@ -6,6 +6,7 @@
<style type="text/css">
body {
background: #000 !important;
color: #fff !important;
}
.reveal .slides > section, .reveal .slides > section > section {
padding: 0;
@ -14,7 +15,6 @@
<script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
<script type="text/javascript" src="reveal.js"></script>
<script type="text/javascript" src="display.js"></script>
<script type="text/javascript">console.log(Display);</script>
</head>
<body>
<div class="reveal">

8
openlp/core/display/window.py
View File

@ -25,6 +25,7 @@ The :mod:`~openlp.core.display.window` module contains the display window
import logging
import os
import json
from inspect import currentframe, getouterframes
from PyQt5 import QtCore, QtWidgets, QtWebChannel
@ -122,6 +123,7 @@ class DisplayWindow(QtWidgets.QWidget):
self.webview.page().setWebChannel(self.channel)
if screen and screen.is_display:
self.update_from_screen(screen)
print(getouterframes(currentframe(), 2)[1][3])
def update_from_screen(self, screen):
"""
@ -276,3 +278,9 @@ class DisplayWindow(QtWidgets.QWidget):
Get the types of videos playable by the embedded media player
"""
return self.run_javascript('Display.getVideoTypes();', is_sync=True)
def show_display(self):
"""
Show the display
"""
self.run_javascript('Display.show();')

6
openlp/core/ui/slidecontroller.py
View File

@ -139,8 +139,8 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
# Delete any existing displays
del self.displays[:]
# for screen in self.screens:
display = DisplayWindow(self, self.screens.current)
self.displays.append(display)
# display = DisplayWindow(self, self.screens.current)
# self.displays.append(display)
# display.media_watcher.progress.connect(self.on_audio_time_remaining)
@property
@ -748,7 +748,7 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
if item.is_text():
self.preview_display.load_verses([{'verse': f['verseTag'], 'text': f['raw_slide']}
for f in item._raw_frames])
self.display
self.preview_display.show_display()
# slide_no = 0
# if self.song_edit:
# slide_no = self.selected_row