forked from openlp/openlp
Re-ordered group boxes as per Raouls request, and applied his radiobox code
This commit is contained in:
parent
5d8c2aae17
commit
74db5acaa3
@ -71,7 +71,6 @@ class GeneralTab(SettingsTab):
|
|||||||
self.overrideRadioButton = QtGui.QRadioButton(self.monitorGroupBox)
|
self.overrideRadioButton = QtGui.QRadioButton(self.monitorGroupBox)
|
||||||
self.overrideRadioButton.setObjectName(u'overrideRadioButton')
|
self.overrideRadioButton.setObjectName(u'overrideRadioButton')
|
||||||
self.monitorLayout.addWidget(self.overrideRadioButton, 3, 0, 1, 5)
|
self.monitorLayout.addWidget(self.overrideRadioButton, 3, 0, 1, 5)
|
||||||
self.leftLayout.addWidget(self.monitorGroupBox)
|
|
||||||
# Custom position
|
# Custom position
|
||||||
self.customXLabel = QtGui.QLabel(self.monitorGroupBox)
|
self.customXLabel = QtGui.QLabel(self.monitorGroupBox)
|
||||||
self.customXLabel.setObjectName(u'customXLabel')
|
self.customXLabel.setObjectName(u'customXLabel')
|
||||||
@ -101,50 +100,16 @@ class GeneralTab(SettingsTab):
|
|||||||
self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
|
self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
|
||||||
self.customHeightValueEdit.setMaximum(9999)
|
self.customHeightValueEdit.setMaximum(9999)
|
||||||
self.monitorLayout.addWidget(self.customHeightValueEdit, 5, 4)
|
self.monitorLayout.addWidget(self.customHeightValueEdit, 5, 4)
|
||||||
|
# Set up the stretchiness of each column, so that the first column
|
||||||
|
# less stretchy (and therefore smaller) than the others
|
||||||
|
self.monitorLayout.setColumnStretch(0, 1)
|
||||||
|
self.monitorLayout.setColumnStretch(1, 3)
|
||||||
|
self.monitorLayout.setColumnStretch(2, 3)
|
||||||
|
self.monitorLayout.setColumnStretch(3, 3)
|
||||||
|
self.monitorLayout.setColumnStretch(4, 3)
|
||||||
self.leftLayout.addWidget(self.monitorGroupBox)
|
self.leftLayout.addWidget(self.monitorGroupBox)
|
||||||
# Application Startup
|
|
||||||
self.startupGroupBox = QtGui.QGroupBox(self.leftColumn)
|
|
||||||
self.startupGroupBox.setObjectName(u'startupGroupBox')
|
|
||||||
self.startupLayout = QtGui.QVBoxLayout(self.startupGroupBox)
|
|
||||||
self.startupLayout.setObjectName(u'startupLayout')
|
|
||||||
self.warningCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
|
||||||
self.warningCheckBox.setObjectName(u'warningCheckBox')
|
|
||||||
self.startupLayout.addWidget(self.warningCheckBox)
|
|
||||||
self.autoOpenCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
|
||||||
self.autoOpenCheckBox.setObjectName(u'autoOpenCheckBox')
|
|
||||||
self.startupLayout.addWidget(self.autoOpenCheckBox)
|
|
||||||
self.showSplashCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
|
||||||
self.showSplashCheckBox.setObjectName(u'showSplashCheckBox')
|
|
||||||
self.startupLayout.addWidget(self.showSplashCheckBox)
|
|
||||||
self.checkForUpdatesCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
|
||||||
self.checkForUpdatesCheckBox.setObjectName(u'checkForUpdatesCheckBox')
|
|
||||||
self.startupLayout.addWidget(self.checkForUpdatesCheckBox)
|
|
||||||
self.leftLayout.addWidget(self.startupGroupBox)
|
|
||||||
# Application Settings
|
|
||||||
self.settingsGroupBox = QtGui.QGroupBox(self.leftColumn)
|
|
||||||
self.settingsGroupBox.setObjectName(u'settingsGroupBox')
|
|
||||||
self.settingsLayout = QtGui.QFormLayout(self.settingsGroupBox)
|
|
||||||
self.settingsLayout.setObjectName(u'settingsLayout')
|
|
||||||
self.saveCheckServiceCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
|
||||||
self.saveCheckServiceCheckBox.setObjectName(u'saveCheckServiceCheckBox')
|
|
||||||
self.settingsLayout.addRow(self.saveCheckServiceCheckBox)
|
|
||||||
self.autoUnblankCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
|
||||||
self.autoUnblankCheckBox.setObjectName(u'autoUnblankCheckBox')
|
|
||||||
self.settingsLayout.addRow(self.autoUnblankCheckBox)
|
|
||||||
self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
|
||||||
self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
|
|
||||||
self.settingsLayout.addRow(self.autoPreviewCheckBox)
|
|
||||||
# Moved here from image tab
|
|
||||||
self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
|
|
||||||
self.timeoutLabel.setObjectName(u'timeoutLabel')
|
|
||||||
self.timeoutSpinBox = QtGui.QSpinBox(self.settingsGroupBox)
|
|
||||||
self.timeoutSpinBox.setObjectName(u'timeoutSpinBox')
|
|
||||||
self.timeoutSpinBox.setRange(1, 180)
|
|
||||||
self.settingsLayout.addRow(self.timeoutLabel, self.timeoutSpinBox)
|
|
||||||
self.leftLayout.addWidget(self.settingsGroupBox)
|
|
||||||
self.leftLayout.addStretch()
|
|
||||||
# CCLI Details
|
# CCLI Details
|
||||||
self.ccliGroupBox = QtGui.QGroupBox(self.rightColumn)
|
self.ccliGroupBox = QtGui.QGroupBox(self.leftColumn)
|
||||||
self.ccliGroupBox.setObjectName(u'ccliGroupBox')
|
self.ccliGroupBox.setObjectName(u'ccliGroupBox')
|
||||||
self.ccliLayout = QtGui.QFormLayout(self.ccliGroupBox)
|
self.ccliLayout = QtGui.QFormLayout(self.ccliGroupBox)
|
||||||
self.ccliLayout.setObjectName(u'ccliLayout')
|
self.ccliLayout.setObjectName(u'ccliLayout')
|
||||||
@ -165,9 +130,9 @@ class GeneralTab(SettingsTab):
|
|||||||
self.passwordEdit.setEchoMode(QtGui.QLineEdit.Password)
|
self.passwordEdit.setEchoMode(QtGui.QLineEdit.Password)
|
||||||
self.passwordEdit.setObjectName(u'passwordEdit')
|
self.passwordEdit.setObjectName(u'passwordEdit')
|
||||||
self.ccliLayout.addRow(self.passwordLabel, self.passwordEdit)
|
self.ccliLayout.addRow(self.passwordLabel, self.passwordEdit)
|
||||||
self.rightLayout.addWidget(self.ccliGroupBox)
|
self.leftLayout.addWidget(self.ccliGroupBox)
|
||||||
# Background audio
|
# Background audio
|
||||||
self.audioGroupBox = QtGui.QGroupBox(self.rightColumn)
|
self.audioGroupBox = QtGui.QGroupBox(self.leftColumn)
|
||||||
self.audioGroupBox.setObjectName(u'audioGroupBox')
|
self.audioGroupBox.setObjectName(u'audioGroupBox')
|
||||||
self.audioLayout = QtGui.QVBoxLayout(self.audioGroupBox)
|
self.audioLayout = QtGui.QVBoxLayout(self.audioGroupBox)
|
||||||
self.audioLayout.setObjectName(u'audioLayout')
|
self.audioLayout.setObjectName(u'audioLayout')
|
||||||
@ -177,7 +142,48 @@ class GeneralTab(SettingsTab):
|
|||||||
self.repeatListCheckBox = QtGui.QCheckBox(self.audioGroupBox)
|
self.repeatListCheckBox = QtGui.QCheckBox(self.audioGroupBox)
|
||||||
self.repeatListCheckBox.setObjectName(u'repeatListCheckBox')
|
self.repeatListCheckBox.setObjectName(u'repeatListCheckBox')
|
||||||
self.audioLayout.addWidget(self.repeatListCheckBox)
|
self.audioLayout.addWidget(self.repeatListCheckBox)
|
||||||
self.rightLayout.addWidget(self.audioGroupBox)
|
self.leftLayout.addWidget(self.audioGroupBox)
|
||||||
|
self.leftLayout.addStretch()
|
||||||
|
# Application Startup
|
||||||
|
self.startupGroupBox = QtGui.QGroupBox(self.rightColumn)
|
||||||
|
self.startupGroupBox.setObjectName(u'startupGroupBox')
|
||||||
|
self.startupLayout = QtGui.QVBoxLayout(self.startupGroupBox)
|
||||||
|
self.startupLayout.setObjectName(u'startupLayout')
|
||||||
|
self.warningCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
||||||
|
self.warningCheckBox.setObjectName(u'warningCheckBox')
|
||||||
|
self.startupLayout.addWidget(self.warningCheckBox)
|
||||||
|
self.autoOpenCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
||||||
|
self.autoOpenCheckBox.setObjectName(u'autoOpenCheckBox')
|
||||||
|
self.startupLayout.addWidget(self.autoOpenCheckBox)
|
||||||
|
self.showSplashCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
||||||
|
self.showSplashCheckBox.setObjectName(u'showSplashCheckBox')
|
||||||
|
self.startupLayout.addWidget(self.showSplashCheckBox)
|
||||||
|
self.checkForUpdatesCheckBox = QtGui.QCheckBox(self.startupGroupBox)
|
||||||
|
self.checkForUpdatesCheckBox.setObjectName(u'checkForUpdatesCheckBox')
|
||||||
|
self.startupLayout.addWidget(self.checkForUpdatesCheckBox)
|
||||||
|
self.rightLayout.addWidget(self.startupGroupBox)
|
||||||
|
# Application Settings
|
||||||
|
self.settingsGroupBox = QtGui.QGroupBox(self.rightColumn)
|
||||||
|
self.settingsGroupBox.setObjectName(u'settingsGroupBox')
|
||||||
|
self.settingsLayout = QtGui.QFormLayout(self.settingsGroupBox)
|
||||||
|
self.settingsLayout.setObjectName(u'settingsLayout')
|
||||||
|
self.saveCheckServiceCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
||||||
|
self.saveCheckServiceCheckBox.setObjectName(u'saveCheckServiceCheckBox')
|
||||||
|
self.settingsLayout.addRow(self.saveCheckServiceCheckBox)
|
||||||
|
self.autoUnblankCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
||||||
|
self.autoUnblankCheckBox.setObjectName(u'autoUnblankCheckBox')
|
||||||
|
self.settingsLayout.addRow(self.autoUnblankCheckBox)
|
||||||
|
self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
|
||||||
|
self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
|
||||||
|
self.settingsLayout.addRow(self.autoPreviewCheckBox)
|
||||||
|
# Moved here from image tab
|
||||||
|
self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
|
||||||
|
self.timeoutLabel.setObjectName(u'timeoutLabel')
|
||||||
|
self.timeoutSpinBox = QtGui.QSpinBox(self.settingsGroupBox)
|
||||||
|
self.timeoutSpinBox.setObjectName(u'timeoutSpinBox')
|
||||||
|
self.timeoutSpinBox.setRange(1, 180)
|
||||||
|
self.settingsLayout.addRow(self.timeoutLabel, self.timeoutSpinBox)
|
||||||
|
self.rightLayout.addWidget(self.settingsGroupBox)
|
||||||
self.rightLayout.addStretch()
|
self.rightLayout.addStretch()
|
||||||
# Signals and slots
|
# Signals and slots
|
||||||
QtCore.QObject.connect(self.overrideRadioButton,
|
QtCore.QObject.connect(self.overrideRadioButton,
|
||||||
|
Loading…
Reference in New Issue
Block a user