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

rename additions to arguments

Browse Source
This commit is contained in:
Tim Bentley 2019-05-04 20:47:06 +01:00
parent 3526c3de64
commit a7821bdd26
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/settings.py
View File

@ -211,7 +211,7 @@ class Settings(QtCore.QSettings):
'images/background color': '#000000', 'images/background color': '#000000',
'media/media auto start': QtCore.Qt.Unchecked, 'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '', 'media/stream command': '',
'media/vlc additions': '', 'media/vlc arguments': '',
'remotes/download version': '0.0', 'remotes/download version': '0.0',
'players/background color': '#000000', 'players/background color': '#000000',
'servicemanager/last directory': None, 'servicemanager/last directory': None,

22
openlp/core/ui/media/mediatab.py
View File

@ -74,14 +74,14 @@ class MediaTab(SettingsTab):
self.stream_edit = QtWidgets.QLabel(self) self.stream_edit = QtWidgets.QLabel(self)
self.stream_media_layout.addWidget(self.stream_edit) self.stream_media_layout.addWidget(self.stream_edit)
self.left_layout.addWidget(self.stream_media_group_box) self.left_layout.addWidget(self.stream_media_group_box)
self.vlc_additions_group_box = QtWidgets.QGroupBox(self.left_column) self.vlc_arguments_group_box = QtWidgets.QGroupBox(self.left_column)
self.vlc_additions_group_box.setObjectName('vlc_additions_group_box') self.vlc_arguments_group_box.setObjectName('vlc_arguments_group_box')
self.vlc_additions_layout = QtWidgets.QHBoxLayout(self.vlc_additions_group_box) self.vlc_arguments_layout = QtWidgets.QHBoxLayout(self.vlc_arguments_group_box)
self.vlc_additions_layout.setObjectName('vlc_additions_layout') self.vlc_arguments_layout.setObjectName('vlc_arguments_layout')
self.vlc_additions_layout.setContentsMargins(0, 0, 0, 0) self.vlc_arguments_layout.setContentsMargins(0, 0, 0, 0)
self.vlc_additions_edit = QtWidgets.QPlainTextEdit(self) self.vlc_arguments_edit = QtWidgets.QPlainTextEdit(self)
self.vlc_additions_layout.addWidget(self.vlc_additions_edit) self.vlc_arguments_layout.addWidget(self.vlc_arguments_edit)
self.left_layout.addWidget(self.vlc_additions_group_box) self.left_layout.addWidget(self.vlc_arguments_group_box)
self.left_layout.addStretch() self.left_layout.addStretch()
self.right_layout.addStretch() self.right_layout.addStretch()
# # Signals and slots # # Signals and slots
@ -92,7 +92,7 @@ class MediaTab(SettingsTab):
""" """
self.live_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Live Media')) self.live_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Live Media'))
self.stream_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Stream Media Command')) self.stream_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Stream Media Command'))
self.vlc_additions_group_box.setTitle(translate('MediaPlugin.MediaTab', 'VLC additional commands')) self.vlc_arguments_group_box.setTitle(translate('MediaPlugin.MediaTab', 'VLC arguments'))
self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically'))
def load(self): def load(self):
@ -108,7 +108,7 @@ class MediaTab(SettingsTab):
self.stream_edit.setText(WIN_STREAM) self.stream_edit.setText(WIN_STREAM)
else: else:
self.stream_edit.setText(OSX_STREAM) self.stream_edit.setText(OSX_STREAM)
self.vlc_additions_edit.setPlainText(Settings().value(self.settings_section + '/vlc additions')) self.vlc_arguments_edit.setPlainText(Settings().value(self.settings_section + '/vlc arguments'))
if Settings().value('advanced/experimental'): if Settings().value('advanced/experimental'):
for cam in QCameraInfo.availableCameras(): for cam in QCameraInfo.availableCameras():
log.debug(cam.deviceName()) log.debug(cam.deviceName())
@ -124,7 +124,7 @@ class MediaTab(SettingsTab):
if Settings().value(setting_key) != self.auto_start_check_box.checkState(): if Settings().value(setting_key) != self.auto_start_check_box.checkState():
Settings().setValue(setting_key, self.auto_start_check_box.checkState()) Settings().setValue(setting_key, self.auto_start_check_box.checkState())
Settings().setValue(self.settings_section + '/stream command', self.stream_edit.text()) Settings().setValue(self.settings_section + '/stream command', self.stream_edit.text())
Settings().setValue(self.settings_section + '/vlc additions', self.vlc_additions_edit.toPlainText()) Settings().setValue(self.settings_section + '/vlc arguments', self.vlc_arguments_edit.toPlainText())
def post_set_up(self, post_update=False): def post_set_up(self, post_update=False):
""" """

4
openlp/core/ui/media/vlcplayer.py
View File

@ -167,8 +167,8 @@ class VlcPlayer(MediaPlayer):
command_line_options = '--no-video-title-show ' command_line_options = '--no-video-title-show '
if Settings().value('advanced/hide mouse') and live_display: if Settings().value('advanced/hide mouse') and live_display:
command_line_options += '--mouse-hide-timeout=0 ' command_line_options += '--mouse-hide-timeout=0 '
if Settings().value('media/vlc additions'): if Settings().value('media/vlc arguments'):
command_line_options += Settings().value('media/vlc additions') command_line_options += Settings().value('media/vlc arguments')
output_display.vlc_instance = vlc.Instance(command_line_options) output_display.vlc_instance = vlc.Instance(command_line_options)
# creating an empty vlc media player # creating an empty vlc media player
output_display.vlc_media_player = output_display.vlc_instance.media_player_new() output_display.vlc_media_player = output_display.vlc_instance.media_player_new()

2
tests/functional/openlp_core/ui/media/test_vlcplayer.py
View File

@ -151,7 +151,7 @@ class TestVLCPlayer(TestCase, TestMixin):
assert mocked_output_display.vlc_widget == mocked_qframe assert mocked_output_display.vlc_widget == mocked_qframe
mocked_qframe.setFrameStyle.assert_called_with(1) mocked_qframe.setFrameStyle.assert_called_with(1)
mocked_settings.value.assert_any_call('advanced/hide mouse') mocked_settings.value.assert_any_call('advanced/hide mouse')
mocked_settings.value.assert_any_call('media/vlc additions') mocked_settings.value.assert_any_call('media/vlc arguments')
mocked_vlc.Instance.assert_called_with('--no-video-title-show ') mocked_vlc.Instance.assert_called_with('--no-video-title-show ')
assert mocked_output_display.vlc_instance == mocked_instance assert mocked_output_display.vlc_instance == mocked_instance
mocked_instance.media_player_new.assert_called_with() mocked_instance.media_player_new.assert_called_with()