forked from openlp/openlp
Cleanups
This commit is contained in:
parent
88a739c1d5
commit
38977e81ea
@ -203,7 +203,7 @@ class Theme(object):
|
|||||||
val = element_text
|
val = element_text
|
||||||
if (element.tag.find(u'Color') > 0 or
|
if (element.tag.find(u'Color') > 0 or
|
||||||
(element.tag.find(u'BackgroundParameter') == 0 and
|
(element.tag.find(u'BackgroundParameter') == 0 and
|
||||||
type(val) == type(0))):
|
isinstance(int, val))):
|
||||||
# convert to a wx.Colour
|
# convert to a wx.Colour
|
||||||
if not delphi_color_change:
|
if not delphi_color_change:
|
||||||
val = QtGui.QColor(
|
val = QtGui.QColor(
|
||||||
|
@ -538,7 +538,7 @@ class VideoDisplay(Phonon.VideoWidget):
|
|||||||
"""
|
"""
|
||||||
self.onMediaStop()
|
self.onMediaStop()
|
||||||
for path in self.outputPaths():
|
for path in self.outputPaths():
|
||||||
disconnected = path.disconnect()
|
path.disconnect()
|
||||||
|
|
||||||
# def onMediaBackground(self, message=None):
|
# def onMediaBackground(self, message=None):
|
||||||
# """
|
# """
|
||||||
@ -664,7 +664,7 @@ class AudioPlayer(QtCore.QObject):
|
|||||||
"""
|
"""
|
||||||
self.onMediaStop()
|
self.onMediaStop()
|
||||||
for path in self.mediaObject.outputPaths():
|
for path in self.mediaObject.outputPaths():
|
||||||
disconnected = path.disconnect()
|
path.disconnect()
|
||||||
|
|
||||||
def onMediaQueue(self, message):
|
def onMediaQueue(self, message):
|
||||||
"""
|
"""
|
||||||
|
@ -33,7 +33,8 @@ log = logging.getLogger(__name__)
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
|
from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
|
||||||
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, ThemeLevel
|
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
|
||||||
|
ThemeLevel
|
||||||
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
|
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
|
||||||
from openlp.core.utils import AppLocation
|
from openlp.core.utils import AppLocation
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user