openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #594808 Main window is too big for small screen resolutions
  https://bugs.launchpad.net/bugs/594808
  #630285 OpeLP goes live on items even though a hide screen mode is active
  https://bugs.launchpad.net/bugs/630285
  #632674 Change plugin to inactive then active produces error
  https://bugs.launchpad.net/bugs/632674


Fix two bugs and a quick hack to get songs working on machines without sqlite2
-- 
https://code.launchpad.net/~trb143/openlp/renderer/+merge/34891
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/renderer into lp:openlp.

=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py	2010-07-27 11:57:25 +0000
+++ openlp/core/ui/plugindialog.py	2010-09-08 18:15:55 +0000
@@ -93,7 +93,6 @@
         self.pluginListButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
         self.pluginListButtonBox.setObjectName(u'pluginListButtonBox')
         self.pluginLayout.addWidget(self.pluginListButtonBox)
-
         self.retranslateUi(pluginViewDialog)
         QtCore.QObject.connect(self.pluginListButtonBox,
             QtCore.SIGNAL(u'accepted()'), pluginViewDialog.close)

=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py	2010-07-27 11:57:25 +0000
+++ openlp/core/ui/pluginform.py	2010-09-08 18:15:55 +0000
@@ -134,5 +134,6 @@
         elif self.activePlugin.status == PluginStatus.Disabled:
             status_text = unicode(
                 translate('OpenLP.PluginForm', '%s (Disabled)'))
-        self.pluginListWidget.currentItem().setText(
-            status_text % self.activePlugin.name)
+        if self.pluginListWidget.currentItem():
+            self.pluginListWidget.currentItem().setText(
+                status_text % self.activePlugin.name)

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-08-28 23:52:10 +0000
+++ openlp/core/ui/slidecontroller.py	2010-09-08 18:15:55 +0000
@@ -162,11 +162,6 @@
         sizeToolbarPolicy.setHeightForWidth(
             self.Toolbar.sizePolicy().hasHeightForWidth())
         self.Toolbar.setSizePolicy(sizeToolbarPolicy)
-#        if self.isLive:
-#            self.Toolbar.addToolbarButton(
-#                u'First Slide', u':/slides/slide_first.png',
-#                translate('OpenLP.SlideController', 'Move to first'),
-#                self.onSlideSelectedFirst)
         self.Toolbar.addToolbarButton(
             u'Previous Slide', u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous'),
@@ -175,11 +170,6 @@
             u'Next Slide', u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
             self.onSlideSelectedNext)
-#        if self.isLive:
-#            self.Toolbar.addToolbarButton(
-#                u'Last Slide', u':/slides/slide_last.png',
-#                translate('OpenLP.SlideController', 'Move to last'),
-#                self.onSlideSelectedLast)
         if self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.HideMenu = QtGui.QToolButton(self.Toolbar)
@@ -279,11 +269,11 @@
         if isLive:
             self.SongMenu = QtGui.QToolButton(self.Toolbar)
             self.SongMenu.setText(translate('OpenLP.SlideController',
-                'Go to Verse'))
+                'Go to'))
             self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
             self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
             self.SongMenu.setMenu(QtGui.QMenu(
-                translate('OpenLP.SlideController', 'Go to Verse'),
+                translate('OpenLP.SlideController', 'Go to'),
                 self.Toolbar))
             self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
         # Screen preview area

=== modified file 'openlp/plugins/songs/lib/olp1import.py'
--- openlp/plugins/songs/lib/olp1import.py	2010-09-06 22:02:48 +0000
+++ openlp/plugins/songs/lib/olp1import.py	2010-09-08 18:15:55 +0000
@@ -28,7 +28,10 @@
 openlp.org 1.x song databases into the current installation database.
 """
 import logging
-import sqlite
+try:
+    import sqlite
+except:
+    pass
 
 from openlp.core.lib import translate
 from songimport import SongImport