From 948cb57d595dfe944c26a4e961659f86cb03863c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 20 Nov 2010 16:36:54 +0000 Subject: [PATCH] Remove blank check box line Fix situation when trying to work with no themes Fixes: https://launchpad.net/bugs/677710 --- openlp/core/ui/advancedtab.py | 6 +++--- openlp/core/ui/maindisplay.py | 1 + openlp/core/ui/thememanager.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index d6289a91d..dc126d863 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -81,9 +81,9 @@ class AdvancedTab(SettingsTab): self.doubleClickLiveCheckBox = QtGui.QCheckBox(self.uiGroupBox) self.doubleClickLiveCheckBox.setObjectName(u'doubleClickLiveCheckBox') self.uiLayout.addWidget(self.doubleClickLiveCheckBox) - self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox) - self.expandServiceItemCheckBox.setObjectName(u'expandServiceItemCheckBox') - self.uiLayout.addWidget(self.expandServiceItemCheckBox) +# self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox) +# self.expandServiceItemCheckBox.setObjectName(u'expandServiceItemCheckBox') +# self.uiLayout.addWidget(self.expandServiceItemCheckBox) self.leftLayout.addWidget(self.uiGroupBox) self.expandServiceItemCheckBox = QtGui.QCheckBox(self.uiGroupBox) self.expandServiceItemCheckBox.setObjectName( diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 84b484878..5a53a84fe 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -36,6 +36,7 @@ from openlp.core.ui import HideMode log = logging.getLogger(__name__) #http://www.steveheffernan.com/html5-video-player/demo-video-player.html +#http://html5demos.com/two-videos class DisplayWidget(QtGui.QGraphicsView): """ diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index e5b8d1a0d..0f0802bf2 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -766,7 +766,7 @@ class ThemeManager(QtGui.QWidget): """ log.debug(u'base theme created') newtheme = ThemeXML() - return newtheme.extract_xml() + return newtheme def createThemeFromXml(self, theme_xml, path): """