Jonathan Corwin has proposed merging lp:~j-corwin/openlp/bug-780026 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #780026 in OpenLP: "Blank button is wrong when song is sent live"
https://bugs.launchpad.net/openlp/+bug/780026
Bug #787783 in OpenLP: "On application startup default images flashes on live
output"
https://bugs.launchpad.net/openlp/+bug/787783
Bug #791345 in OpenLP: "Small white box in media manager after disabling a
plugin "
https://bugs.launchpad.net/openlp/+bug/791345
For more details, see:
https://code.launchpad.net/~j-corwin/openlp/bug-780026/+merge/63156
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.
--
https://code.launchpad.net/~j-corwin/openlp/bug-780026/+merge/63156
Your team OpenLP Core is requested to review the proposed merge of
lp:~j-corwin/openlp/bug-780026 into lp:openlp.
=== modified file 'openlp.pyw'
--- openlp.pyw 2011-05-26 20:41:19 +0000
+++ openlp.pyw 2011-06-01 19:11:33 +0000
@@ -133,6 +133,7 @@
u'general/update check', QtCore.QVariant(True)).toBool()
if update_check:
VersionThread(self.mainWindow).start()
+ Receiver.send_message(u'maindisplay_blank_check')
self.mainWindow.appStartup()
DelayStartThread(self.mainWindow).start()
return self.exec_()
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2011-05-28 18:47:14 +0000
+++ openlp/core/lib/mediamanageritem.py 2011-06-01 19:11:33 +0000
@@ -91,6 +91,7 @@
Constructor to create the media manager item.
"""
QtGui.QWidget.__init__(self, parent)
+ self.hide()
self.whitespace = re.compile(r'\W+', re.UNICODE)
self.plugin = plugin
visible_title = self.plugin.getString(StringContent.VisibleName)
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2011-05-28 18:47:14 +0000
+++ openlp/core/lib/renderer.py 2011-06-01 19:11:33 +0000
@@ -67,7 +67,7 @@
``theme_manager``
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.image_manager = image_manager
self.screens = ScreenList.get_instance()
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-05-28 20:12:32 +0000
+++ openlp/core/ui/maindisplay.py 2011-06-01 19:11:33 +0000
@@ -148,7 +148,6 @@
self.__hideMouse()
# To display or not to display?
if not self.screen[u'primary']:
- self.show()
self.primary = False
else:
self.primary = True
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2011-05-29 16:00:37 +0000
+++ openlp/core/ui/mainwindow.py 2011-06-01 19:11:33 +0000
@@ -678,13 +678,12 @@
def blankCheck(self):
"""
Check and display message if screen blank on setup.
- Triggered by delay thread.
"""
settings = QtCore.QSettings()
+ self.liveController.mainDisplaySetBackground()
if settings.value(u'%s/screen blank' % self.generalSettingsSection,
QtCore.QVariant(False)).toBool():
- self.liveController.mainDisplaySetBackground()
- if settings.value(u'blank warning',
+ if settings.value(u'%s/blank warning' % self.generalSettingsSection,
QtCore.QVariant(False)).toBool():
QtGui.QMessageBox.question(self,
translate('OpenLP.MainWindow',
=== modified file 'openlp/core/ui/screen.py'
--- openlp/core/ui/screen.py 2011-05-26 17:11:22 +0000
+++ openlp/core/ui/screen.py 2011-06-01 19:11:33 +0000
@@ -241,6 +241,7 @@
height = settings.value(u'height',
QtCore.QVariant(self.current[u'size'].height())).toInt()[0]
self.override[u'size'] = QtCore.QRect(x, y, width, height)
+ self.override[u'primary'] = False
settings.endGroup()
if override_display:
self.set_override_display()
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2011-05-29 20:46:13 +0000
+++ openlp/core/ui/slidecontroller.py 2011-06-01 19:11:33 +0000
@@ -742,8 +742,10 @@
self.onThemeDisplay(True)
elif display_type == u'hidden':
self.onHideDisplay(True)
- else:
+ elif display_type == u'blanked':
self.onBlankDisplay(True)
+ else:
+ Receiver.send_message(u'maindisplay_show')
def onSlideBlank(self):
"""
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2011-05-26 17:11:22 +0000
+++ openlp/core/utils/__init__.py 2011-06-01 19:11:33 +0000
@@ -69,7 +69,6 @@
Run the thread.
"""
time.sleep(1)
- Receiver.send_message(u'maindisplay_blank_check')
app_version = get_application_version()
version = check_latest_version(app_version)
remote_version = {}
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
