openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #677710 Dragging video from media manager to the service manager results in error
  https://bugs.launchpad.net/bugs/677710


Re hide check box!
Fix case with no themes defined and trying to display a song.
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/41400
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2010-11-04 17:02:10 +0000
+++ openlp/core/ui/advancedtab.py	2010-11-20 16:41:37 +0000
@@ -81,9 +81,9 @@
         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(

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-11-03 17:40:45 +0000
+++ openlp/core/ui/maindisplay.py	2010-11-20 16:41:37 +0000
@@ -36,6 +36,7 @@
 log = logging.getLogger(__name__)
 
 #http://www.steveheffernan.com/html5-video-player/demo-video-player.html
+#http://html5demos.com/two-videos
 
 class DisplayWidget(QtGui.QGraphicsView):
     """

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-11-18 17:46:47 +0000
+++ openlp/core/ui/thememanager.py	2010-11-20 16:41:37 +0000
@@ -766,7 +766,7 @@
         """
         log.debug(u'base theme created')
         newtheme = ThemeXML()
-        return newtheme.extract_xml()
+        return newtheme
 
     def createThemeFromXml(self, theme_xml, path):
         """