forked from openlp/openlp
Adjust output to use new images
This commit is contained in:
parent
fda3f1c93c
commit
f1e04b6d62
@ -855,6 +855,10 @@ class SlideController(Controller):
|
|||||||
else:
|
else:
|
||||||
label = QtGui.QLabel()
|
label = QtGui.QLabel()
|
||||||
label.setMargin(4)
|
label.setMargin(4)
|
||||||
|
if serviceItem.is_media():
|
||||||
|
label.setAlignment(QtCore.Qt.AlignHCenter |
|
||||||
|
QtCore.Qt.AlignVCenter)
|
||||||
|
else:
|
||||||
label.setScaledContents(True)
|
label.setScaledContents(True)
|
||||||
if self.serviceItem.is_command():
|
if self.serviceItem.is_command():
|
||||||
label.setPixmap(QtGui.QPixmap(frame[u'image']))
|
label.setPixmap(QtGui.QPixmap(frame[u'image']))
|
||||||
|
@ -42,8 +42,9 @@ from openlp.core.ui.media import get_media_players, set_media_players
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
CLAPPERBOARD = QtGui.QImage(u':/media/image_clapperboard.png')
|
CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
|
||||||
#TODO: Add an appropriate Icon for DVDs, CDs, ...
|
VIDEO = QtGui.QImage(u':/media/media_video.png')
|
||||||
|
AUDIO = QtGui.QImage(u':/media/media_audio.png')
|
||||||
DVD_ICON = QtGui.QImage(u':/media/media_video.png')
|
DVD_ICON = QtGui.QImage(u':/media/media_video.png')
|
||||||
|
|
||||||
class MediaMediaItem(MediaManagerItem):
|
class MediaMediaItem(MediaManagerItem):
|
||||||
@ -218,14 +219,14 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
service_item.add_capability(ItemCapabilities.RequiresMedia)
|
service_item.add_capability(ItemCapabilities.RequiresMedia)
|
||||||
# force a non-existent theme
|
# force a non-existent theme
|
||||||
service_item.theme = -1
|
service_item.theme = -1
|
||||||
frame = u':/media/image_clapperboard.png'
|
frame = CLAPPERBOARD
|
||||||
(path, name) = os.path.split(filename)
|
(path, name) = os.path.split(filename)
|
||||||
service_item.add_from_command(path, name, frame)
|
service_item.add_from_command(path, name, frame)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def initialise(self):
|
def initialise(self):
|
||||||
self.listView.clear()
|
self.listView.clear()
|
||||||
self.listView.setIconSize(QtCore.QSize(44, 25))
|
self.listView.setIconSize(QtCore.QSize(88, 50))
|
||||||
self.loadList(SettingsManager.load_list(self.settingsSection, u'media'))
|
self.loadList(SettingsManager.load_list(self.settingsSection, u'media'))
|
||||||
self.populateDisplayTypes()
|
self.populateDisplayTypes()
|
||||||
|
|
||||||
@ -293,7 +294,7 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
if track_info.isFile():
|
if track_info.isFile():
|
||||||
filename = os.path.split(unicode(track))[1]
|
filename = os.path.split(unicode(track))[1]
|
||||||
item_name = QtGui.QListWidgetItem(filename)
|
item_name = QtGui.QListWidgetItem(filename)
|
||||||
item_name.setIcon(build_icon(CLAPPERBOARD))
|
item_name.setIcon(build_icon(VIDEO))
|
||||||
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(track))
|
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(track))
|
||||||
else:
|
else:
|
||||||
filename = os.path.split(unicode(track))[1]
|
filename = os.path.split(unicode(track))[1]
|
||||||
|
Loading…
Reference in New Issue
Block a user