← Back to branch summary

~marmyshev/openlp/itunes

« back to all changes in this revision

Viewing changes to openlp/plugins/alerts/lib/alertstab.py

  • Committer: Andreas Preikschat
  • Date: 2012-12-28 20:15:56 UTC
  • mfrom: (1970.2.54 bug-779201-2)
  • Revision ID: googol@lavabit.com-20121228201556-i1p7aq0byf5cuip7
https://launchpad.net/bugs/779201
QString and QVariant auto-conversion (bug #779201)

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/alerts/lib/alertstab.py
29
29
 
30
30
from PyQt4 import QtCore, QtGui
31
31
 
32
 
from openlp.core.lib import SettingsTab, translate, Receiver
 
32
from openlp.core.lib import SettingsTab, translate, Receiver, Settings
33
33
from openlp.core.ui import AlertLocation
34
34
from openlp.core.lib.ui import UiStrings, create_valign_selection_widgets
35
 
from openlp.core.lib.settings import Settings
36
35
 
37
36
class AlertsTab(SettingsTab):
38
37
    """
157
156
    def load(self):
158
157
        settings = Settings()
159
158
        settings.beginGroup(self.settingsSection)
160
 
        self.timeout = settings.value(u'timeout', QtCore.QVariant(5)).toInt()[0]
161
 
        self.font_color = unicode(settings.value(
162
 
            u'font color', QtCore.QVariant(u'#ffffff')).toString())
163
 
        self.font_size = settings.value(
164
 
            u'font size', QtCore.QVariant(40)).toInt()[0]
165
 
        self.bg_color = unicode(settings.value(
166
 
            u'background color', QtCore.QVariant(u'#660000')).toString())
167
 
        self.font_face = unicode(settings.value(
168
 
            u'font face', QtCore.QVariant(QtGui.QFont().family())).toString())
169
 
        self.location = settings.value(
170
 
            u'location', QtCore.QVariant(AlertLocation.Bottom)).toInt()[0]
 
159
        self.timeout = settings.value(u'timeout', 5)
 
160
        self.font_color = settings.value(u'font color', u'#ffffff')
 
161
        self.font_size = settings.value(u'font size', 40)
 
162
        self.bg_color = settings.value(u'background color', u'#660000')
 
163
        self.font_face = settings.value(u'font face', QtGui.QFont().family())
 
164
        self.location = settings.value(u'location', AlertLocation.Bottom)
171
165
        settings.endGroup()
172
166
        self.fontSizeSpinBox.setValue(self.font_size)
173
167
        self.timeoutSpinBox.setValue(self.timeout)
186
180
        settings = Settings()
187
181
        settings.beginGroup(self.settingsSection)
188
182
        # Check value has changed as no event handles this field
189
 
        if settings.value(u'location', QtCore.QVariant(1)).toInt()[0] != \
 
183
        if settings.value(u'location', 1) != \
190
184
            self.verticalComboBox.currentIndex():
191
185
            self.changed = True
192
 
        settings.setValue(u'background color', QtCore.QVariant(self.bg_color))
193
 
        settings.setValue(u'font color', QtCore.QVariant(self.font_color))
194
 
        settings.setValue(u'font size', QtCore.QVariant(self.font_size))
 
186
        settings.setValue(u'background color', self.bg_color)
 
187
        settings.setValue(u'font color', self.font_color)
 
188
        settings.setValue(u'font size', self.font_size)
195
189
        self.font_face = self.fontComboBox.currentFont().family()
196
 
        settings.setValue(u'font face', QtCore.QVariant(self.font_face))
197
 
        settings.setValue(u'timeout', QtCore.QVariant(self.timeout))
 
190
        settings.setValue(u'font face', self.font_face)
 
191
        settings.setValue(u'timeout', self.timeout)
198
192
        self.location = self.verticalComboBox.currentIndex()
199
 
        settings.setValue(u'location', QtCore.QVariant(self.location))
 
193
        settings.setValue(u'location', self.location)
200
194
        settings.endGroup()
201
195
        if self.changed:
202
196
            Receiver.send_message(u'update_display_css')