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

Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized

Browse Source
This commit is contained in:
Jonathan Springer 2015-09-08 15:11:09 -04:00
parent 814177e380
commit 934a9cb7b3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openlp/plugins/media/lib/mediaitem.py
View File

@ -44,10 +44,9 @@ log = logging.getLogger(__name__)
CLAPPERBOARD = ':/media/slidecontroller_multimedia.png' CLAPPERBOARD = ':/media/slidecontroller_multimedia.png'
OPTICAL = ':/media/media_optical.png' OPTICAL = ':/media/media_optical.png'
VIDEO_ICON = build_icon(':/media/media_video.png') VIDEO = ':/media/media_video.png'
AUDIO_ICON = build_icon(':/media/media_audio.png') AUDIO = ':/media/media_audio.png'
OPTICAL_ICON = build_icon(OPTICAL) ERROR = ':/general/general_delete.png'
ERROR_ICON = build_icon(':/general/general_delete.png')
class MediaMediaItem(MediaManagerItem, RegistryProperties): class MediaMediaItem(MediaManagerItem, RegistryProperties):
@ -130,7 +129,8 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD') optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
optical_button_tooltip = translate('MediaPlugin.MediaItem', optical_button_tooltip = translate('MediaPlugin.MediaItem',
'Load CD/DVD - only supported when VLC is installed and enabled') 'Load CD/DVD - only supported when VLC is installed and enabled')
self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=OPTICAL_ICON, text=optical_button_text, self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=build_icon(OPTICAL),
text=optical_button_text,
tooltip=optical_button_tooltip, tooltip=optical_button_tooltip,
triggers=self.on_load_optical) triggers=self.on_load_optical)
if disable_optical_button_text: if disable_optical_button_text:
@ -351,14 +351,14 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
# Handle optical based item # Handle optical based item
(file_name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(track) (file_name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(track)
item_name = QtGui.QListWidgetItem(clip_name) item_name = QtGui.QListWidgetItem(clip_name)
item_name.setIcon(OPTICAL_ICON) item_name.setIcon(build_icon(OPTICAL))
item_name.setData(QtCore.Qt.UserRole, track) item_name.setData(QtCore.Qt.UserRole, track)
item_name.setToolTip('%s@%s-%s' % (file_name, format_milliseconds(start), format_milliseconds(end))) item_name.setToolTip('%s@%s-%s' % (file_name, format_milliseconds(start), format_milliseconds(end)))
elif not os.path.exists(track): elif not os.path.exists(track):
# File doesn't exist, mark as error. # File doesn't exist, mark as error.
file_name = os.path.split(str(track))[1] file_name = os.path.split(str(track))[1]
item_name = QtGui.QListWidgetItem(file_name) item_name = QtGui.QListWidgetItem(file_name)
item_name.setIcon(ERROR_ICON) item_name.setIcon(build_icon(ERROR))
item_name.setData(QtCore.Qt.UserRole, track) item_name.setData(QtCore.Qt.UserRole, track)
item_name.setToolTip(track) item_name.setToolTip(track)
elif track_info.isFile(): elif track_info.isFile():
@ -366,9 +366,9 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
file_name = os.path.split(str(track))[1] file_name = os.path.split(str(track))[1]
item_name = QtGui.QListWidgetItem(file_name) item_name = QtGui.QListWidgetItem(file_name)
if '*.%s' % (file_name.split('.')[-1].lower()) in self.media_controller.audio_extensions_list: if '*.%s' % (file_name.split('.')[-1].lower()) in self.media_controller.audio_extensions_list:
item_name.setIcon(AUDIO_ICON) item_name.setIcon(build_icon(AUDIO))
else: else:
item_name.setIcon(VIDEO_ICON) item_name.setIcon(build_icon(VIDEO))
item_name.setData(QtCore.Qt.UserRole, track) item_name.setData(QtCore.Qt.UserRole, track)
item_name.setToolTip(track) item_name.setToolTip(track)
if item_name: if item_name: