forked from openlp/openlp
Fix review comments
This commit is contained in:
parent
bc3295be03
commit
c11454b02d
|
@ -155,7 +155,7 @@ class AdvancedTab(SettingsTab):
|
||||||
self.expandServiceItemCheckBox.setText(translate('OpenLP.AdvancedTab',
|
self.expandServiceItemCheckBox.setText(translate('OpenLP.AdvancedTab',
|
||||||
'Expand new service items on creation'))
|
'Expand new service items on creation'))
|
||||||
self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
|
self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
|
||||||
'Enable confirm on closure'))
|
'Enable application exit confirmation'))
|
||||||
# self.sharedDirGroupBox.setTitle(
|
# self.sharedDirGroupBox.setTitle(
|
||||||
# translate('AdvancedTab', 'Central Data Store'))
|
# translate('AdvancedTab', 'Central Data Store'))
|
||||||
# self.sharedCheckBox.setText(
|
# self.sharedCheckBox.setText(
|
||||||
|
@ -187,7 +187,7 @@ class AdvancedTab(SettingsTab):
|
||||||
settings.value(u'expand service item',
|
settings.value(u'expand service item',
|
||||||
QtCore.QVariant(False)).toBool())
|
QtCore.QVariant(False)).toBool())
|
||||||
self.enableAutoCloseCheckBox.setChecked(
|
self.enableAutoCloseCheckBox.setChecked(
|
||||||
settings.value(u'enable auto close',
|
settings.value(u'enable exit confirmation',
|
||||||
QtCore.QVariant(True)).toBool())
|
QtCore.QVariant(True)).toBool())
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ class AdvancedTab(SettingsTab):
|
||||||
QtCore.QVariant(self.doubleClickLiveCheckBox.isChecked()))
|
QtCore.QVariant(self.doubleClickLiveCheckBox.isChecked()))
|
||||||
settings.setValue(u'expand service item',
|
settings.setValue(u'expand service item',
|
||||||
QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
|
QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
|
||||||
settings.setValue(u'enable auto close',
|
settings.setValue(u'enable exit confirmation',
|
||||||
QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
|
QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
|
|
||||||
|
@ -215,4 +215,4 @@ class AdvancedTab(SettingsTab):
|
||||||
# """
|
# """
|
||||||
# self.sharedLabel.setEnabled(checked)
|
# self.sharedLabel.setEnabled(checked)
|
||||||
# self.sharedTextEdit.setEnabled(checked)
|
# self.sharedTextEdit.setEnabled(checked)
|
||||||
# self.sharedPushButton.setEnabled(checked)
|
# self.sharedPushButton.setEnabled(checked)
|
|
@ -94,7 +94,6 @@ class MainDisplay(DisplayWidget):
|
||||||
"""
|
"""
|
||||||
This is the display screen.
|
This is the display screen.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, parent, screens, live):
|
def __init__(self, parent, screens, live):
|
||||||
DisplayWidget.__init__(self, live, parent=None)
|
DisplayWidget.__init__(self, live, parent=None)
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
|
@ -116,7 +115,7 @@ class MainDisplay(DisplayWidget):
|
||||||
"""
|
"""
|
||||||
Set up and build the output screen
|
Set up and build the output screen
|
||||||
"""
|
"""
|
||||||
log.debug(u'Setup live = %s for %s ' % (self.isLive,
|
log.debug(u'Setup live = %s for monitor %s ' % (self.isLive,
|
||||||
self.screens.monitor_number))
|
self.screens.monitor_number))
|
||||||
self.usePhonon = QtCore.QSettings().value(
|
self.usePhonon = QtCore.QSettings().value(
|
||||||
u'media/use phonon', QtCore.QVariant(True)).toBool()
|
u'media/use phonon', QtCore.QVariant(True)).toBool()
|
||||||
|
|
|
@ -853,7 +853,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
else:
|
else:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
else:
|
else:
|
||||||
if QtCore.QSettings().value(u'advanced/enable auto close',
|
if QtCore.QSettings().value(u'advanced/enable exit confirmation',
|
||||||
QtCore.QVariant(True)).toBool():
|
QtCore.QVariant(True)).toBool():
|
||||||
ret = QtGui.QMessageBox.question(self,
|
ret = QtGui.QMessageBox.question(self,
|
||||||
translate('OpenLP.MainWindow', 'Close OpenLP'),
|
translate('OpenLP.MainWindow', 'Close OpenLP'),
|
||||||
|
@ -1059,4 +1059,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
self.recentFiles.insert(0, QtCore.QString(filename))
|
self.recentFiles.insert(0, QtCore.QString(filename))
|
||||||
while self.recentFiles.count() > maxRecentFiles:
|
while self.recentFiles.count() > maxRecentFiles:
|
||||||
# Don't care what API says takeLast works, removeLast doesn't!
|
# Don't care what API says takeLast works, removeLast doesn't!
|
||||||
self.recentFiles.takeLast()
|
self.recentFiles.takeLast()
|
Loading…
Reference in New Issue