diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index 0c006781d..716445889 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -28,8 +28,6 @@ Provide common toolbar handling for OpenLP """ import logging -from PyQt4 import QtCore, QtGui - from openlp.core.lib import build_icon log = logging.getLogger(__name__) @@ -51,7 +49,7 @@ class OpenLPToolbar(QtGui.QToolBar): log.debug(u'Init done') def addToolbarButton(self, title, icon, tooltip=None, slot=None, - checkable=False, shortcut=0, alternate=0, + checkable=False, shortcut=0, alternate=0, context=QtCore.Qt.WidgetShortcut): """ A method to help developers easily add a button to the toolbar. diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 47ec6b6eb..615d2d2f3 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -155,13 +155,13 @@ class ServiceManager(QtGui.QWidget): u':/services/service_top.png', translate('OpenLP.ServiceManager', 'Move item to the top of the service.'), - self.onServiceTop, shortcut=QtCore.Qt.Key_Home) + self.onServiceTop, shortcut=QtCore.Qt.Key_Home) self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move &up'), u':/services/service_up.png', translate('OpenLP.ServiceManager', 'Move item up one position in the service.'), - self.onServiceUp, shortcut=QtCore.Qt.Key_PageUp) + self.onServiceUp, shortcut=QtCore.Qt.Key_PageUp) self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move &down'), u':/services/service_down.png', diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index f3da9f026..3ff97e7f4 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -432,9 +432,6 @@ class SlideController(QtGui.QWidget): self.display.imageManager = self.parent.renderManager.image_manager self.display.alertTab = self.alertTab self.display.setup() - self.SlidePreview.setFixedSize( - QtCore.QSize(self.settingsmanager.slidecontroller_image, - self.settingsmanager.slidecontroller_image / self.ratio)) if self.isLive: self.display.addActions( [self.previousItem,