forked from openlp/openlp
Fix problems with remembering blank/hidden state when starting up, and with the startup logo flashing briefly on the screen. Also fix the Show blank warning box.
Fix toolbox appearing on the media manager when it's associated plugin is inactive. Make the override display act like a dual display on startup. I.e. it appears. bzr-revno: 1603
This commit is contained in:
commit
596123dd06
@ -133,6 +133,7 @@ class OpenLP(QtGui.QApplication):
|
|||||||
u'general/update check', QtCore.QVariant(True)).toBool()
|
u'general/update check', QtCore.QVariant(True)).toBool()
|
||||||
if update_check:
|
if update_check:
|
||||||
VersionThread(self.mainWindow).start()
|
VersionThread(self.mainWindow).start()
|
||||||
|
Receiver.send_message(u'maindisplay_blank_check')
|
||||||
self.mainWindow.appStartup()
|
self.mainWindow.appStartup()
|
||||||
DelayStartThread(self.mainWindow).start()
|
DelayStartThread(self.mainWindow).start()
|
||||||
return self.exec_()
|
return self.exec_()
|
||||||
|
@ -91,6 +91,7 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
Constructor to create the media manager item.
|
Constructor to create the media manager item.
|
||||||
"""
|
"""
|
||||||
QtGui.QWidget.__init__(self, parent)
|
QtGui.QWidget.__init__(self, parent)
|
||||||
|
self.hide()
|
||||||
self.whitespace = re.compile(r'\W+', re.UNICODE)
|
self.whitespace = re.compile(r'\W+', re.UNICODE)
|
||||||
self.plugin = plugin
|
self.plugin = plugin
|
||||||
visible_title = self.plugin.getString(StringContent.VisibleName)
|
visible_title = self.plugin.getString(StringContent.VisibleName)
|
||||||
|
@ -67,7 +67,7 @@ class Renderer(object):
|
|||||||
``theme_manager``
|
``theme_manager``
|
||||||
The ThemeManager instance, used to get the current theme details.
|
The ThemeManager instance, used to get the current theme details.
|
||||||
"""
|
"""
|
||||||
log.debug(u'Initilisation started')
|
log.debug(u'Initialisation started')
|
||||||
self.theme_manager = theme_manager
|
self.theme_manager = theme_manager
|
||||||
self.image_manager = image_manager
|
self.image_manager = image_manager
|
||||||
self.screens = ScreenList.get_instance()
|
self.screens = ScreenList.get_instance()
|
||||||
|
@ -148,7 +148,6 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
self.__hideMouse()
|
self.__hideMouse()
|
||||||
# To display or not to display?
|
# To display or not to display?
|
||||||
if not self.screen[u'primary']:
|
if not self.screen[u'primary']:
|
||||||
self.show()
|
|
||||||
self.primary = False
|
self.primary = False
|
||||||
else:
|
else:
|
||||||
self.primary = True
|
self.primary = True
|
||||||
|
@ -678,13 +678,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
def blankCheck(self):
|
def blankCheck(self):
|
||||||
"""
|
"""
|
||||||
Check and display message if screen blank on setup.
|
Check and display message if screen blank on setup.
|
||||||
Triggered by delay thread.
|
|
||||||
"""
|
"""
|
||||||
settings = QtCore.QSettings()
|
settings = QtCore.QSettings()
|
||||||
|
self.liveController.mainDisplaySetBackground()
|
||||||
if settings.value(u'%s/screen blank' % self.generalSettingsSection,
|
if settings.value(u'%s/screen blank' % self.generalSettingsSection,
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
self.liveController.mainDisplaySetBackground()
|
if settings.value(u'%s/blank warning' % self.generalSettingsSection,
|
||||||
if settings.value(u'blank warning',
|
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
QtGui.QMessageBox.question(self,
|
QtGui.QMessageBox.question(self,
|
||||||
translate('OpenLP.MainWindow',
|
translate('OpenLP.MainWindow',
|
||||||
|
@ -241,6 +241,7 @@ class ScreenList(object):
|
|||||||
height = settings.value(u'height',
|
height = settings.value(u'height',
|
||||||
QtCore.QVariant(self.current[u'size'].height())).toInt()[0]
|
QtCore.QVariant(self.current[u'size'].height())).toInt()[0]
|
||||||
self.override[u'size'] = QtCore.QRect(x, y, width, height)
|
self.override[u'size'] = QtCore.QRect(x, y, width, height)
|
||||||
|
self.override[u'primary'] = False
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
if override_display:
|
if override_display:
|
||||||
self.set_override_display()
|
self.set_override_display()
|
||||||
|
@ -742,8 +742,10 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.onThemeDisplay(True)
|
self.onThemeDisplay(True)
|
||||||
elif display_type == u'hidden':
|
elif display_type == u'hidden':
|
||||||
self.onHideDisplay(True)
|
self.onHideDisplay(True)
|
||||||
else:
|
elif display_type == u'blanked':
|
||||||
self.onBlankDisplay(True)
|
self.onBlankDisplay(True)
|
||||||
|
else:
|
||||||
|
Receiver.send_message(u'maindisplay_show')
|
||||||
|
|
||||||
def onSlideBlank(self):
|
def onSlideBlank(self):
|
||||||
"""
|
"""
|
||||||
|
@ -69,7 +69,6 @@ class VersionThread(QtCore.QThread):
|
|||||||
Run the thread.
|
Run the thread.
|
||||||
"""
|
"""
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
Receiver.send_message(u'maindisplay_blank_check')
|
|
||||||
app_version = get_application_version()
|
app_version = get_application_version()
|
||||||
version = check_latest_version(app_version)
|
version = check_latest_version(app_version)
|
||||||
remote_version = {}
|
remote_version = {}
|
||||||
|
Loading…
Reference in New Issue
Block a user