mirror of https://gitlab.com/openlp/openlp.git
fixed settingsTab rename
This commit is contained in:
parent
52cecd44a2
commit
4283742081
|
@ -175,7 +175,7 @@ class MainDisplay(Display):
|
||||||
We need to rebuild the CSS on the live display.
|
We need to rebuild the CSS on the live display.
|
||||||
"""
|
"""
|
||||||
for plugin in self.plugin_manager.plugins:
|
for plugin in self.plugin_manager.plugins:
|
||||||
plugin.refreshCss(self.frame)
|
plugin.refresh_css(self.frame)
|
||||||
|
|
||||||
def retranslateUi(self):
|
def retranslateUi(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -225,7 +225,7 @@ class AlertsPlugin(Plugin):
|
||||||
``frame``
|
``frame``
|
||||||
The Web frame holding the page.
|
The Web frame holding the page.
|
||||||
"""
|
"""
|
||||||
align = VerticalType.Names[self.settingsTab.location]
|
align = VerticalType.Names[self.settings_tab.location]
|
||||||
frame.evaluateJavaScript(u'update_css("%s", "%s", "%s", "%s", "%s")' %
|
frame.evaluateJavaScript(u'update_css("%s", "%s", "%s", "%s", "%s")' %
|
||||||
(align, self.settingsTab.font_face, self.settingsTab.font_size,
|
(align, self.settings_tab.font_face, self.settings_tab.font_size,
|
||||||
self.settingsTab.font_color, self.settingsTab.background_color))
|
self.settings_tab.font_color, self.settings_tab.background_color))
|
||||||
|
|
|
@ -87,7 +87,7 @@ class AlertsManager(QtCore.QObject):
|
||||||
if not self.alert_list:
|
if not self.alert_list:
|
||||||
return
|
return
|
||||||
text = self.alert_list.pop(0)
|
text = self.alert_list.pop(0)
|
||||||
alertTab = self.parent().settingsTab
|
alertTab = self.parent().settings_tab
|
||||||
self.live_controller.display.alert(text, alertTab.location)
|
self.live_controller.display.alert(text, alertTab.location)
|
||||||
# Check to see if we have a timer running.
|
# Check to see if we have a timer running.
|
||||||
if self.timer_id == 0:
|
if self.timer_id == 0:
|
||||||
|
@ -103,7 +103,7 @@ class AlertsManager(QtCore.QObject):
|
||||||
"""
|
"""
|
||||||
log.debug(u'timer event')
|
log.debug(u'timer event')
|
||||||
if event.timerId() == self.timer_id:
|
if event.timerId() == self.timer_id:
|
||||||
alertTab = self.parent().settingsTab
|
alertTab = self.parent().settings_tab
|
||||||
self.live_controller.display.alert(u'', alertTab.location)
|
self.live_controller.display.alert(u'', alertTab.location)
|
||||||
self.killTimer(self.timer_id)
|
self.killTimer(self.timer_id)
|
||||||
self.timer_id = 0
|
self.timer_id = 0
|
||||||
|
|
|
@ -127,6 +127,7 @@ class MediaPlugin(Plugin):
|
||||||
Plugin.app_startup(self)
|
Plugin.app_startup(self)
|
||||||
settings = Settings()
|
settings = Settings()
|
||||||
settings.beginGroup(self.settings_section)
|
settings.beginGroup(self.settings_section)
|
||||||
|
# FIXME: Probably broken due to Settings rewrite.
|
||||||
if settings.contains(u'use phonon'):
|
if settings.contains(u'use phonon'):
|
||||||
log.info(u'Found old Phonon setting')
|
log.info(u'Found old Phonon setting')
|
||||||
players = self.media_controller.mediaPlayers.keys()
|
players = self.media_controller.mediaPlayers.keys()
|
||||||
|
@ -139,7 +140,7 @@ class MediaPlugin(Plugin):
|
||||||
new_players.insert(0, u'phonon')
|
new_players.insert(0, u'phonon')
|
||||||
self.media_controller.mediaPlayers[u'phonon'].is_active = True
|
self.media_controller.mediaPlayers[u'phonon'].is_active = True
|
||||||
settings.setValue(u'players', u','.join(new_players))
|
settings.setValue(u'players', u','.join(new_players))
|
||||||
self.settingsTab.load()
|
self.settings_tab.load()
|
||||||
settings.remove(u'use phonon')
|
settings.remove(u'use phonon')
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue