mirror of https://gitlab.com/openlp/openlp.git
Cleanups
This commit is contained in:
parent
e487ca46fa
commit
9785e7f1be
|
@ -33,7 +33,8 @@ from urllib import quote_plus as urlquote
|
||||||
|
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
from sqlalchemy import Table, MetaData, Column, types, create_engine
|
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.orm import scoped_session, sessionmaker, mapper
|
||||||
from sqlalchemy.pool import NullPool
|
from sqlalchemy.pool import NullPool
|
||||||
|
|
||||||
|
|
|
@ -295,7 +295,8 @@ class GeneralTab(SettingsTab):
|
||||||
QtCore.QVariant(False)).toBool())
|
QtCore.QVariant(False)).toBool())
|
||||||
self.timeoutSpinBox.setValue(settings.value(u'loop delay',
|
self.timeoutSpinBox.setValue(settings.value(u'loop delay',
|
||||||
QtCore.QVariant(5)).toInt()[0])
|
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())
|
QtCore.QVariant(False)).toBool())
|
||||||
self.overrideRadioButton.setChecked(settings.value(u'override position',
|
self.overrideRadioButton.setChecked(settings.value(u'override position',
|
||||||
QtCore.QVariant(False)).toBool())
|
QtCore.QVariant(False)).toBool())
|
||||||
|
@ -313,11 +314,14 @@ class GeneralTab(SettingsTab):
|
||||||
u'audio repeat list', QtCore.QVariant(False)).toBool())
|
u'audio repeat list', QtCore.QVariant(False)).toBool())
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
self.monitorComboBox.setDisabled(self.overrideRadioButton.isChecked())
|
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.customXValueEdit.setEnabled(self.overrideRadioButton.isChecked())
|
||||||
self.customYValueEdit.setEnabled(self.overrideRadioButton.isChecked())
|
self.customYValueEdit.setEnabled(self.overrideRadioButton.isChecked())
|
||||||
self.customHeightValueEdit.setEnabled(self.overrideRadioButton.isChecked())
|
self.customHeightValueEdit.setEnabled(
|
||||||
self.customWidthValueEdit.setEnabled(self.overrideRadioButton.isChecked())
|
self.overrideRadioButton.isChecked())
|
||||||
|
self.customWidthValueEdit.setEnabled(
|
||||||
|
self.overrideRadioButton.isChecked())
|
||||||
self.display_changed = False
|
self.display_changed = False
|
||||||
settings.beginGroup(self.settingsSection)
|
settings.beginGroup(self.settingsSection)
|
||||||
|
|
||||||
|
|
|
@ -281,7 +281,8 @@ class MediaController(object):
|
||||||
controller.mediabar.setVisible(value)
|
controller.mediabar.setVisible(value)
|
||||||
if controller.isLive and controller.display:
|
if controller.isLive and controller.display:
|
||||||
if self.curDisplayMediaPlayer and value:
|
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)
|
controller.display.setTransparency(False)
|
||||||
# Special controls: Here media type specific Controls will be enabled
|
# Special controls: Here media type specific Controls will be enabled
|
||||||
# (e.g. for DVD control, ...)
|
# (e.g. for DVD control, ...)
|
||||||
|
|
|
@ -563,7 +563,8 @@ class SlideController(Controller):
|
||||||
Receiver.send_message('servicemanager_previous_item')
|
Receiver.send_message('servicemanager_previous_item')
|
||||||
elif keypressCommand == ServiceItemAction.PreviousLastSlide:
|
elif keypressCommand == ServiceItemAction.PreviousLastSlide:
|
||||||
# Go to the last slide of the previous item
|
# 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:
|
else:
|
||||||
Receiver.send_message('servicemanager_next_item')
|
Receiver.send_message('servicemanager_next_item')
|
||||||
self.keypress_loop = False
|
self.keypress_loop = False
|
||||||
|
@ -1183,7 +1184,8 @@ class SlideController(Controller):
|
||||||
if self.slide_limits == SlideLimits.Wrap:
|
if self.slide_limits == SlideLimits.Wrap:
|
||||||
row = self.previewListWidget.rowCount() - 1
|
row = self.previewListWidget.rowCount() - 1
|
||||||
elif self.isLive and self.slide_limits == SlideLimits.Next:
|
elif self.isLive and self.slide_limits == SlideLimits.Next:
|
||||||
self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
|
self.keypress_queue.append(
|
||||||
|
ServiceItemAction.PreviousLastSlide)
|
||||||
self._process_queue()
|
self._process_queue()
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -87,7 +87,8 @@ class RemoteTab(SettingsTab):
|
||||||
self.qrLayout = QtGui.QVBoxLayout(self.androidAppGroupBox)
|
self.qrLayout = QtGui.QVBoxLayout(self.androidAppGroupBox)
|
||||||
self.qrLayout.setObjectName(u'qrLayout')
|
self.qrLayout.setObjectName(u'qrLayout')
|
||||||
self.qrCodeLabel = QtGui.QLabel(self.androidAppGroupBox)
|
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.setAlignment(QtCore.Qt.AlignCenter)
|
||||||
self.qrCodeLabel.setObjectName(u'qrCodeLabel')
|
self.qrCodeLabel.setObjectName(u'qrCodeLabel')
|
||||||
self.qrLayout.addWidget(self.qrCodeLabel)
|
self.qrLayout.addWidget(self.qrCodeLabel)
|
||||||
|
|
Loading…
Reference in New Issue