From cfca50ff2578fd9deeea07542eff67555604956b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 Sep 2010 18:51:19 +0100 Subject: [PATCH 1/3] Fix setText bug when null list item Fixes: https://launchpad.net/bugs/632674 --- openlp/core/ui/plugindialog.py | 1 - openlp/core/ui/pluginform.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py index a4256c0e5..9d12651c9 100644 --- a/openlp/core/ui/plugindialog.py +++ b/openlp/core/ui/plugindialog.py @@ -93,7 +93,6 @@ class Ui_PluginViewDialog(object): 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) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index c0fd53938..8bf490f85 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -134,5 +134,6 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): 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) From b39136782e35fee9b72c5c964e2cb4ff5d922780 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 Sep 2010 19:00:48 +0100 Subject: [PATCH 2/3] Quick hack to get songs back --- openlp/core/lib/htmlbuilder.py | 1 + openlp/plugins/songs/lib/olp1import.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index acf00bdeb..0d6482797 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -519,6 +519,7 @@ def build_footer_css(item): font-size: %spt; color: %s; text-align: %s; + vertical-align: bottom; """ theme = item.themedata if not theme or not item.footer: diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py index 953b509b4..51e3e1fbf 100644 --- a/openlp/plugins/songs/lib/olp1import.py +++ b/openlp/plugins/songs/lib/olp1import.py @@ -28,7 +28,10 @@ The :mod:`olp1import` module provides the functionality for importing 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 From ccb75ad3b6ca7bed5a9c017406c5320f7b636819 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 Sep 2010 19:12:16 +0100 Subject: [PATCH 3/3] Fix display to work on 1024x768 resolution without nasty slider movements Fixes: https://launchpad.net/bugs/594808 --- openlp/core/lib/htmlbuilder.py | 1 - openlp/core/ui/slidecontroller.py | 14 ++------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 0d6482797..acf00bdeb 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -519,7 +519,6 @@ def build_footer_css(item): font-size: %spt; color: %s; text-align: %s; - vertical-align: bottom; """ theme = item.themedata if not theme or not item.footer: diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 5d688b890..2ea985598 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -162,11 +162,6 @@ class SlideController(QtGui.QWidget): 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 @@ class SlideController(QtGui.QWidget): 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 @@ class SlideController(QtGui.QWidget): 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