raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

General Tab fixes

This commit is contained in:
Tim Bentley 2009-10-19 17:18:32 +01:00
parent 2004edf876
commit 0bbbf8b6b8
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/toolbar.py
View File

@ -136,4 +136,4 @@ class OpenLPToolbar(QtGui.QToolBar):
pushButton.setCheckable(True)
pushButton.setFlat(True)
self.addWidget(pushButton)
return pushButton
return pushButton

4
openlp/core/ui/generaltab.py
View File

@ -173,7 +173,7 @@ class GeneralTab(SettingsTab):
self.MonitorComboBox.addItem(screen_name)
# Get the configs
self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0'))
self.Warning = str_to_bool(self.config.get_config(u'Warning', u'False'))
self.Warning = str_to_bool(self.config.get_config(u'Blank Warning', u'False'))
self.AutoOpen = str_to_bool(self.config.get_config(u'Auto Open', u'False'))
self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True'))
self.CCLNumber = unicode(self.config.get_config(u'CCL Number', u'XXX'))
@ -190,7 +190,7 @@ class GeneralTab(SettingsTab):
def save(self):
self.config.set_config(u'Monitor', self.MonitorNumber)
self.config.set_config(u'Warning', self.Warning)
self.config.set_config(u'Blank Warning', self.Warning)
self.config.set_config(u'Auto Open', self.AutoOpen)
self.config.set_config(u'show splash', self.ShowSplash)
self.config.set_config(u'CCL Number', self.CCLNumber)

1
openlp/core/ui/maindisplay.py
View File

@ -182,6 +182,7 @@ class MainDisplay(DisplayLabel):
self.displayBlank = False
if self.frame is not None:
self.frameView(self.frame)
self.parent.generalConfig.set_config(u'Screen Blank',self.displayBlank)
def displayAlert(self, text=u''):
"""

3
openlp/core/ui/mainwindow.py
View File

@ -581,6 +581,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.versionCheck()
if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
self.ServiceManagerContents.onLoadService(True)
if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
and str_to_bool(self.generalConfig.get_config(u'Blank Warning', False)):
print "Popup goes here"
def onHelpAboutItemClicked(self):
"""