forked from openlp/openlp
little corrections
This commit is contained in:
parent
a0769ce544
commit
210f0e693b
@ -77,24 +77,21 @@ def get_media_players():
|
|||||||
here an special media player is choosen for all media actions
|
here an special media player is choosen for all media actions
|
||||||
"""
|
"""
|
||||||
log.debug(u'get_media_players')
|
log.debug(u'get_media_players')
|
||||||
players = str(QtCore.QSettings().value(u'media/players',
|
players = unicode(QtCore.QSettings().value(u'media/players').toString())
|
||||||
QtCore.QVariant(u'webkit')).toString())
|
if not players:
|
||||||
if len(players) == 0:
|
|
||||||
players = u'webkit'
|
players = u'webkit'
|
||||||
reg_ex = QtCore.QRegExp(".*\[(.*)\].*")
|
reg_ex = QtCore.QRegExp(".*\[(.*)\].*")
|
||||||
can_override = True if QtCore.QSettings().value(u'media/override player',
|
if QtCore.QSettings().value(u'media/override player',
|
||||||
QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked else False
|
QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0] == QtCore.Qt.Checked:
|
||||||
if can_override:
|
|
||||||
if reg_ex.exactMatch(players):
|
if reg_ex.exactMatch(players):
|
||||||
overridden_player = u'%s' % reg_ex.cap(1)
|
overridden_player = u'%s' % reg_ex.cap(1)
|
||||||
else:
|
else:
|
||||||
overridden_player = u'auto'
|
overridden_player = u'auto'
|
||||||
else:
|
else:
|
||||||
overridden_player = u''
|
overridden_player = u''
|
||||||
players_list = players.replace('[', '').replace(']', '').split(u',')
|
players_list = players.replace(u'[', u'').replace(u']', u'').split(u',')
|
||||||
return players_list, overridden_player
|
return players_list, overridden_player
|
||||||
|
|
||||||
|
|
||||||
def set_media_players(players_list, overridden_player=u'auto'):
|
def set_media_players(players_list, overridden_player=u'auto'):
|
||||||
"""
|
"""
|
||||||
This method saves the configured media players and overridden player to the
|
This method saves the configured media players and overridden player to the
|
||||||
@ -107,9 +104,9 @@ def set_media_players(players_list, overridden_player=u'auto'):
|
|||||||
"""
|
"""
|
||||||
log.debug(u'set_media_players')
|
log.debug(u'set_media_players')
|
||||||
players = u','.join(players_list)
|
players = u','.join(players_list)
|
||||||
can_override = True if QtCore.QSettings().value(u'media/override player',
|
if QtCore.QSettings().value(u'media/override player',
|
||||||
QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked else False
|
QtCore.QVariant(QtCore.Qt.Unchecked)).toInt()[0] == \
|
||||||
if can_override and overridden_player != u'auto':
|
QtCore.Qt.Checked and overridden_player != u'auto':
|
||||||
players = players.replace(overridden_player, u'[%s]' % overridden_player)
|
players = players.replace(overridden_player, u'[%s]' % overridden_player)
|
||||||
QtCore.QSettings().setValue(u'media/players', QtCore.QVariant(players))
|
QtCore.QSettings().setValue(u'media/players', QtCore.QVariant(players))
|
||||||
|
|
||||||
|
@ -358,7 +358,7 @@ class MediaController(object):
|
|||||||
Select the correct media Player type from the prioritized Player list
|
Select the correct media Player type from the prioritized Player list
|
||||||
"""
|
"""
|
||||||
usedPlayers, overriddenPlayer = get_media_players()
|
usedPlayers, overriddenPlayer = get_media_players()
|
||||||
if overriddenPlayer != '' and overriddenPlayer != 'auto':
|
if overriddenPlayer and overriddenPlayer != u'auto':
|
||||||
usedPlayers = [overriddenPlayer]
|
usedPlayers = [overriddenPlayer]
|
||||||
if controller.media_info.file_info.isFile():
|
if controller.media_info.file_info.isFile():
|
||||||
suffix = u'*.%s' % \
|
suffix = u'*.%s' % \
|
||||||
|
@ -263,7 +263,7 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
if self.displayTypeComboBox.count() > 1:
|
if self.displayTypeComboBox.count() > 1:
|
||||||
self.displayTypeComboBox.insertItem(0, self.automatic)
|
self.displayTypeComboBox.insertItem(0, self.automatic)
|
||||||
self.displayTypeComboBox.setCurrentIndex(currentIndex)
|
self.displayTypeComboBox.setCurrentIndex(currentIndex)
|
||||||
if overridePlayer != '':
|
if overridePlayer:
|
||||||
self.mediaWidget.show()
|
self.mediaWidget.show()
|
||||||
else:
|
else:
|
||||||
self.mediaWidget.hide()
|
self.mediaWidget.hide()
|
||||||
|
@ -198,7 +198,7 @@ class MediaTab(SettingsTab):
|
|||||||
player_string_changed = True
|
player_string_changed = True
|
||||||
override_changed = True
|
override_changed = True
|
||||||
setting_key = self.settingsSection + u'/override player'
|
setting_key = self.settingsSection + u'/override player'
|
||||||
if QtCore.QSettings().value(setting_key) != \
|
if QtCore.QSettings().value(setting_key).toInt()[0] != \
|
||||||
self.overridePlayerCheckBox.checkState():
|
self.overridePlayerCheckBox.checkState():
|
||||||
QtCore.QSettings().setValue(setting_key,
|
QtCore.QSettings().setValue(setting_key,
|
||||||
QtCore.QVariant(self.overridePlayerCheckBox.checkState()))
|
QtCore.QVariant(self.overridePlayerCheckBox.checkState()))
|
||||||
|
Loading…
Reference in New Issue
Block a user