diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index 436ea82de..e097983eb 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -33,7 +33,8 @@ from urllib import quote_plus as urlquote from PyQt4 import QtCore from sqlalchemy import Table, MetaData, Column, types, create_engine -from sqlalchemy.exc import SQLAlchemyError, InvalidRequestError, DBAPIError +from sqlalchemy.exc import SQLAlchemyError, InvalidRequestError, DBAPIError, \ + OperationalError from sqlalchemy.orm import scoped_session, sessionmaker, mapper from sqlalchemy.pool import NullPool diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 7c1156078..b4d424b10 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -295,7 +295,8 @@ class GeneralTab(SettingsTab): QtCore.QVariant(False)).toBool()) self.timeoutSpinBox.setValue(settings.value(u'loop delay', QtCore.QVariant(5)).toInt()[0]) - self.monitorRadioButton.setChecked(not settings.value(u'override position', + self.monitorRadioButton.setChecked( + not settings.value(u'override position', QtCore.QVariant(False)).toBool()) self.overrideRadioButton.setChecked(settings.value(u'override position', QtCore.QVariant(False)).toBool()) @@ -313,11 +314,14 @@ class GeneralTab(SettingsTab): u'audio repeat list', QtCore.QVariant(False)).toBool()) settings.endGroup() self.monitorComboBox.setDisabled(self.overrideRadioButton.isChecked()) - self.displayOnMonitorCheck.setDisabled(self.overrideRadioButton.isChecked()) + self.displayOnMonitorCheck.setDisabled( + self.overrideRadioButton.isChecked()) self.customXValueEdit.setEnabled(self.overrideRadioButton.isChecked()) self.customYValueEdit.setEnabled(self.overrideRadioButton.isChecked()) - self.customHeightValueEdit.setEnabled(self.overrideRadioButton.isChecked()) - self.customWidthValueEdit.setEnabled(self.overrideRadioButton.isChecked()) + self.customHeightValueEdit.setEnabled( + self.overrideRadioButton.isChecked()) + self.customWidthValueEdit.setEnabled( + self.overrideRadioButton.isChecked()) self.display_changed = False settings.beginGroup(self.settingsSection) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 33ce2ad84..257fa4a19 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -281,7 +281,8 @@ class MediaController(object): controller.mediabar.setVisible(value) if controller.isLive and controller.display: if self.curDisplayMediaPlayer and value: - if self.curDisplayMediaPlayer[controller.display] != self.mediaPlayers[u'webkit']: + if self.curDisplayMediaPlayer[controller.display] != \ + self.mediaPlayers[u'webkit']: controller.display.setTransparency(False) # Special controls: Here media type specific Controls will be enabled # (e.g. for DVD control, ...) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 420c3c6f2..6454dab96 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -563,7 +563,8 @@ class SlideController(Controller): Receiver.send_message('servicemanager_previous_item') elif keypressCommand == ServiceItemAction.PreviousLastSlide: # Go to the last slide of the previous item - Receiver.send_message('servicemanager_previous_item', u'last slide') + Receiver.send_message('servicemanager_previous_item', + u'last slide') else: Receiver.send_message('servicemanager_next_item') self.keypress_loop = False @@ -1183,7 +1184,8 @@ class SlideController(Controller): if self.slide_limits == SlideLimits.Wrap: row = self.previewListWidget.rowCount() - 1 elif self.isLive and self.slide_limits == SlideLimits.Next: - self.keypress_queue.append(ServiceItemAction.PreviousLastSlide) + self.keypress_queue.append( + ServiceItemAction.PreviousLastSlide) self._process_queue() return else: diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 70005226c..845542c45 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -87,7 +87,8 @@ class RemoteTab(SettingsTab): self.qrLayout = QtGui.QVBoxLayout(self.androidAppGroupBox) self.qrLayout.setObjectName(u'qrLayout') self.qrCodeLabel = QtGui.QLabel(self.androidAppGroupBox) - self.qrCodeLabel.setPixmap(QtGui.QPixmap(u':/remotes/android_app_qr.png')) + self.qrCodeLabel.setPixmap(QtGui.QPixmap( + u':/remotes/android_app_qr.png')) self.qrCodeLabel.setAlignment(QtCore.Qt.AlignCenter) self.qrCodeLabel.setObjectName(u'qrCodeLabel') self.qrLayout.addWidget(self.qrCodeLabel)